Few fixes for k8s-ha-contrail-40
Change-Id: If847a721c69bf0e4933c6ef3e1cc14bd5119e9ab
diff --git a/classes/cluster/k8s-ha-contrail-40/infra/config.yml b/classes/cluster/k8s-ha-contrail-40/infra/config.yml
index 69a8d1b..217a0fd 100644
--- a/classes/cluster/k8s-ha-contrail-40/infra/config.yml
+++ b/classes/cluster/k8s-ha-contrail-40/infra/config.yml
@@ -10,6 +10,7 @@
- system.reclass.storage.salt
- system.reclass.storage.system.kubernetes_control_cluster
- cluster.k8s-ha-contrail-40.infra
+- cluster.overrides
parameters:
_param:
@@ -113,23 +114,22 @@
- cluster.<<node_cluster>>.kubernetes.compute
node:
kubernetes_control_node01:
+ classes:
+ - cluster.${_param:cluster_name}.opencontrail.control
params:
rabbitmq_cluster_role: master
opencontrail_database_id: 1
- node_class:
- value_template:
- - cluster.<<node_cluster>>.opencontrail.control
+
kubernetes_control_node02:
+ classes:
+ - cluster.${_param:cluster_name}.opencontrail.control
params:
rabbitmq_cluster_role: slave
opencontrail_database_id: 2
- node_class:
- value_template:
- - cluster.<<node_cluster>>.opencontrail.control
+
kubernetes_control_node03:
+ classes:
+ - cluster.${_param:cluster_name}.opencontrail.control
params:
rabbitmq_cluster_role: slave
opencontrail_database_id: 3
- node_class:
- value_template:
- - cluster.<<node_cluster>>.opencontrail.control
diff --git a/classes/cluster/k8s-ha-contrail-40/kubernetes/compute.yml b/classes/cluster/k8s-ha-contrail-40/kubernetes/compute.yml
index c3addf5..b1750ee 100644
--- a/classes/cluster/k8s-ha-contrail-40/kubernetes/compute.yml
+++ b/classes/cluster/k8s-ha-contrail-40/kubernetes/compute.yml
@@ -6,6 +6,7 @@
- system.salt.minion.cert.etcd_client
- cluster.k8s-ha-contrail-40.opencontrail.compute
- cluster.k8s-ha-contrail-40.kubernetes
+- cluster.overrides
parameters:
linux:
diff --git a/classes/cluster/k8s-ha-contrail-40/kubernetes/control.yml b/classes/cluster/k8s-ha-contrail-40/kubernetes/control.yml
index 161940e..2f3d81e 100644
--- a/classes/cluster/k8s-ha-contrail-40/kubernetes/control.yml
+++ b/classes/cluster/k8s-ha-contrail-40/kubernetes/control.yml
@@ -10,6 +10,7 @@
- system.salt.minion.cert.etcd_server
- system.kubernetes.master.cluster
- cluster.k8s-ha-contrail-40.infra
+- cluster.overrides
parameters:
_param:
keepalived_vip_interface: ens4
@@ -24,17 +25,19 @@
mtu: 1500
address: ${_param:deploy_address}
netmask: '255.255.255.0'
-
+ ipflush_onchange: true
+
ens4:
enabled: true
type: eth
mtu: 1500
address: ${_param:single_address}
netmask: '255.255.255.0'
+ ipflush_onchange: true
etcd:
server:
bind:
- host: ${_param:deploy_address}
+ host: ${_param:single_address}
source:
engine: docker_hybrid
ssl:
diff --git a/classes/cluster/k8s-ha-contrail-40/kubernetes/init.yml b/classes/cluster/k8s-ha-contrail-40/kubernetes/init.yml
index d019809..f9a25db 100644
--- a/classes/cluster/k8s-ha-contrail-40/kubernetes/init.yml
+++ b/classes/cluster/k8s-ha-contrail-40/kubernetes/init.yml
@@ -70,7 +70,7 @@
kubernetes_proxy_node01_address: 172.16.10.121
cluster_vip_address: ${_param:kubernetes_control_address}
- cluster_local_address: ${_param:deploy_address}
+ cluster_local_address: ${_param:single_address}
# etcd stuff
cluster_node01_hostname: ${_param:kubernetes_control_node01_hostname}
diff --git a/classes/cluster/k8s-ha-contrail-40/opencontrail/compute.yml b/classes/cluster/k8s-ha-contrail-40/opencontrail/compute.yml
index 447ac9c..a78fce2 100644
--- a/classes/cluster/k8s-ha-contrail-40/opencontrail/compute.yml
+++ b/classes/cluster/k8s-ha-contrail-40/opencontrail/compute.yml
@@ -3,10 +3,10 @@
- system.opencontrail.compute.cluster
- system.opencontrail.client.cluster
- system.opencontrail.client.resource.virtual_router
-- system.opencontrail.client.resource.k8s_api
- system.opencontrail.compute.cluster4_0
- cluster.k8s-ha-contrail-40.infra
- cluster.k8s-ha-contrail-40.opencontrail
+- cluster.overrides
parameters:
_param:
diff --git a/classes/cluster/k8s-ha-contrail-40/opencontrail/control.yml b/classes/cluster/k8s-ha-contrail-40/opencontrail/control.yml
index c76cc57..2045011 100644
--- a/classes/cluster/k8s-ha-contrail-40/opencontrail/control.yml
+++ b/classes/cluster/k8s-ha-contrail-40/opencontrail/control.yml
@@ -2,7 +2,7 @@
- system.linux.system.lowmem
- system.linux.system.repo.cassandra
- system.linux.system.repo.mcp.contrail
-- system.linux.system.repo.mcp.openstack
+# - system.linux.system.repo.mcp.openstack
- system.linux.system.repo.mcp.extra
- system.linux.system.repo.saltstack.xenial
- system.opencontrail.client.resource.edge_router
@@ -13,9 +13,11 @@
- system.opencontrail.client.resource.database_node
- system.opencontrail.client.resource.analytics_node
- system.opencontrail.client.resource.global_vrouter_config
+- system.opencontrail.client.resource.k8s_api
- system.haproxy.proxy.listen.opencontrail.analytics
- cluster.k8s-ha-contrail-40.infra
- cluster.k8s-ha-contrail-40.opencontrail
+- cluster.overrides
parameters:
_param:
@@ -39,6 +41,12 @@
opencontrail:
compute:
enabled: false
+ version: ${_param:opencontrail_version}
+ disable_flow_collection: true
+ interface:
+ dev: ens4
+ address: None
+ mtu: 1500
common:
identity:
host: none
diff --git a/classes/cluster/k8s-ha-contrail-40/opencontrail/init.yml b/classes/cluster/k8s-ha-contrail-40/opencontrail/init.yml
index 0e57868..3a29757 100644
--- a/classes/cluster/k8s-ha-contrail-40/opencontrail/init.yml
+++ b/classes/cluster/k8s-ha-contrail-40/opencontrail/init.yml
@@ -6,7 +6,7 @@
opencontrail_control_node02_hostname: ctl02
opencontrail_control_node03_hostname: ctl03
- opencontrail_control_address: 172.16.10.252
+ opencontrail_control_address: 172.16.10.253
opencontrail_control_node01_address: 172.16.10.101
opencontrail_control_node02_address: 172.16.10.102
opencontrail_control_node03_address: 172.16.10.103