| commit | 5dc6b66c33d2f39ea141a3a116d7e3f388358e5d | [log] [tgz] |
|---|---|---|
| author | mcp-jenkins <mcp-jenkins@mirantis.com> | Sun Dec 23 21:25:08 2018 +0000 |
| committer | Gerrit Code Review <mail@domain.com> | Sun Dec 23 21:25:08 2018 +0000 |
| tree | a24892e9c727b5503409a5547fcd775135dae90d | |
| parent | 3c881322dea4674b43505e4a80ab6f7b18e59c1a [diff] | |
| parent | 469dfaf845fd5c6f3288ec672e8ed94dece396d1 [diff] |
Merge "Move k8s etcd definitions to reclass."
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 6644937..c8c9177 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 2efade9..ee73105 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 5ccc75b..a385999 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 9583727..a966ed5 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}