Attempt to fix k8s-ha-contrail
Change-Id: I4b5a50ee2edcf2d18282bc7dd8da2f4133b5d3bb
diff --git a/classes/cluster/k8s-ha-contrail/opencontrail/control.yml b/classes/cluster/k8s-ha-contrail/opencontrail/control.yml
index 0c101cc..50e7e6d 100644
--- a/classes/cluster/k8s-ha-contrail/opencontrail/control.yml
+++ b/classes/cluster/k8s-ha-contrail/opencontrail/control.yml
@@ -6,14 +6,15 @@
- system.linux.system.repo.mcp.extra
- system.linux.system.repo.saltstack.trusty
- system.opencontrail.client.resource.edge_router
-- system.rabbitmq.server.cluster
- system.opencontrail.control.cluster
- system.opencontrail.client.cluster
- system.opencontrail.client.resource.control_node
- 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.haproxy.proxy.listen.opencontrail.analytics
+- system.rabbitmq.server.cluster
- cluster.k8s-ha-contrail
parameters:
_param:
diff --git a/classes/cluster/k8s-ha-contrail/opencontrail/init.yml b/classes/cluster/k8s-ha-contrail/opencontrail/init.yml
index cd3445a..7ed1b19 100644
--- a/classes/cluster/k8s-ha-contrail/opencontrail/init.yml
+++ b/classes/cluster/k8s-ha-contrail/opencontrail/init.yml
@@ -1,6 +1,7 @@
parameters:
_param:
opencontrail_version: 3.0
+ linux_repo_contrail_component: oc323
opencontrail_control_hostname: ntw
opencontrail_control_node01_hostname: ntw01
opencontrail_control_node02_hostname: ntw02