github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Modified etcd manifest to support clustering."

Browse Source
This commit is contained in:
Daniel Smith
2016-07-27 12:03:21 -07:00
committed by GitHub
parent 1aaea5fe09
commit fb3f02fb68
5 changed files with 2 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
cluster/saltbase/salt/etcd/etcd.manifest
View File

@@ -1,20 +1,3 @@
{% set cluster_state = 'new' -%}
{% set host_name = pillar.get('master_name', '') -%}
{% set etcd_cluster_array = pillar.get('initial_etcd_cluster', '').split(',') -%}
{% set etcd_cluster = '' -%}
{# We use vars dictionary to pass variables set inside the for loop, because jinja defines new variables inside the for loop that hide variables from the outside. #}
{% set vars = {'etcd_cluster': '', 'cluster_state': cluster_state} -%}
{% for host in etcd_cluster_array -%}
{% if etcd_cluster != '' -%}
{% set cluster_state = 'existing' -%}
{% set etcd_cluster = etcd_cluster ~ ',' -%}
{% endif -%}
{% set etcd_cluster = etcd_cluster ~ 'etcd-' ~ host ~ '=http://' ~ host ~ ':' ~ server_port -%}
{% do vars.update({'etcd_cluster': etcd_cluster, 'cluster_state': cluster_state}) -%}
{% endfor -%}
{% set etcd_cluster = vars.etcd_cluster -%}
{% set cluster_state = vars.cluster_state -%}
{
"apiVersion": "v1",
"kind": "Pod",
@@ -36,7 +19,7 @@
"command": [
"/bin/sh",
"-c",
"/usr/local/bin/etcd --name etcd-{{ host_name }} --listen-peer-urls http://{{ host_name }}:{{ server_port }} --initial-advertise-peer-urls http://{{ host_name }}:{{ server_port }} --advertise-client-urls http://127.0.0.1:{{ port }} --listen-client-urls http://127.0.0.1:{{ port }} --data-dir /var/etcd/data{{ suffix }} --initial-cluster {{ etcd_cluster }} --initial-cluster-state {{ cluster_state }} 1>>/var/log/etcd{{ suffix }}.log 2>&1"
"/usr/local/bin/etcd --listen-peer-urls http://127.0.0.1:{{ server_port }} --advertise-client-urls http://127.0.0.1:{{ port }} --listen-client-urls http://127.0.0.1:{{ port }} --data-dir /var/etcd/data{{ suffix }} 1>>/var/log/etcd{{ suffix }}.log 2>&1"
],
"livenessProbe": {
"httpGet": {