| commit | 469dfaf845fd5c6f3288ec672e8ed94dece396d1 | [log] [tgz] |
|---|---|---|
| author | Andrey Shestakov <ashestakov@mirantis.com> | Thu Nov 15 14:57:43 2018 +0200 |
| committer | Victor Ryzhenkin <vryzhenkin@mirantis.com> | Tue Dec 18 19:07:03 2018 +0000 |
| tree | c4fd857f14a4a087e4dbf6b9dcdabeaa0ca748e5 | |
| parent | aabffb6601991a3e7faf906061caec9958174fcd [diff] |
Move k8s etcd definitions to reclass. Related story: PROD-24674 Change-Id: Ia5e99a4eb55e5fe416512e27f7f7892d733c61eb
diff --git a/classes/cluster/k8s-ha-calico-flannel-virtlet/kubernetes/control.yml b/classes/cluster/k8s-ha-calico-flannel-virtlet/kubernetes/control.yml index df26498..0827a20 100644 --- a/classes/cluster/k8s-ha-calico-flannel-virtlet/kubernetes/control.yml +++ b/classes/cluster/k8s-ha-calico-flannel-virtlet/kubernetes/control.yml
@@ -18,12 +18,6 @@ keepalived_k8s_apiserver_vip_password: password etcd: server: - bind: - host: ${_param:deploy_address} - source: - engine: docker_hybrid - ssl: - enabled: true setup: calico: key: /calico/ipam/v2/assignment/ipv4/block/${_param:calico_private_network}-${_param:calico_private_netmask}
diff --git a/classes/cluster/k8s-ha-calico/kubernetes/control.yml b/classes/cluster/k8s-ha-calico/kubernetes/control.yml index 3786be8..4925c38 100644 --- a/classes/cluster/k8s-ha-calico/kubernetes/control.yml +++ b/classes/cluster/k8s-ha-calico/kubernetes/control.yml
@@ -17,12 +17,6 @@ keepalived_k8s_apiserver_vip_password: password etcd: server: - bind: - host: ${_param:deploy_address} - source: - engine: docker_hybrid - ssl: - enabled: true setup: calico: key: /calico/ipam/v2/assignment/ipv4/block/${_param:calico_private_network}-${_param:calico_private_netmask}
diff --git a/classes/cluster/k8s-ha-contrail-40/kubernetes/control.yml b/classes/cluster/k8s-ha-contrail-40/kubernetes/control.yml index 29b9565..3ed645e 100644 --- a/classes/cluster/k8s-ha-contrail-40/kubernetes/control.yml +++ b/classes/cluster/k8s-ha-contrail-40/kubernetes/control.yml
@@ -33,14 +33,6 @@ address: ${_param:single_address} pre_up_cmds: - ip addr flush dev ens4 - etcd: - server: - bind: - host: ${_param:single_address} - source: - engine: docker_hybrid - ssl: - enabled: true kubernetes: pool: kubelet:
diff --git a/classes/cluster/sl-k8s-calico/kubernetes/control.yml b/classes/cluster/sl-k8s-calico/kubernetes/control.yml index ea86427..f62199d 100644 --- a/classes/cluster/sl-k8s-calico/kubernetes/control.yml +++ b/classes/cluster/sl-k8s-calico/kubernetes/control.yml
@@ -19,12 +19,6 @@ cluster_local_address: ${_param:deploy_address} etcd: server: - bind: - host: ${_param:deploy_address} - source: - engine: docker_hybrid - ssl: - enabled: true setup: calico: key: /calico/ipam/v2/assignment/ipv4/block/${_param:calico_private_network}-${_param:calico_private_netmask}