Change K8s version for OC4.0 + fix keepalived
Change-Id: I5f897d0cdda0034bf62495ab88342aa28162dcf7
diff --git a/classes/cluster/k8s-ha-contrail-40/opencontrail/control.yml b/classes/cluster/k8s-ha-contrail-40/opencontrail/control.yml
index 4dfad76..a1e3f0b 100644
--- a/classes/cluster/k8s-ha-contrail-40/opencontrail/control.yml
+++ b/classes/cluster/k8s-ha-contrail-40/opencontrail/control.yml
@@ -11,7 +11,6 @@
- system.opencontrail.client.resource.config_node
- 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
@@ -75,4 +74,6 @@
engine: k8s
host: none
bind:
- address: ${_param:single_address}
\ No newline at end of file
+ address: ${_param:single_address}
+ master:
+ host: ${_param:opencontrail_control_address}
diff --git a/classes/cluster/k8s-ha-contrail-40/opencontrail/init.yml b/classes/cluster/k8s-ha-contrail-40/opencontrail/init.yml
index 3a29757..4ec9301 100644
--- a/classes/cluster/k8s-ha-contrail-40/opencontrail/init.yml
+++ b/classes/cluster/k8s-ha-contrail-40/opencontrail/init.yml
@@ -25,3 +25,6 @@
openstack_version: none
openstack_control_address: none
keystone_admin_password: none
+
+ keepalived_vip_interface: ens4
+ keepalived_vip_address: ${_param:opencontrail_control_address}