Update virtual-mcp11-k8s-contrail
- Updated k8s part
- Minor updates for contrail part
Change-Id: Iad8cd491dcb33bd1fc03d05389ed0d3a848ef600
Related-PROD: PROD-18983
diff --git a/classes/cluster/virtual-mcp11-k8s-contrail/opencontrail/control.yml b/classes/cluster/virtual-mcp11-k8s-contrail/opencontrail/control.yml
index d3dde42..0945af2 100644
--- a/classes/cluster/virtual-mcp11-k8s-contrail/opencontrail/control.yml
+++ b/classes/cluster/virtual-mcp11-k8s-contrail/opencontrail/control.yml
@@ -1,10 +1,10 @@
classes:
- 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.extra
-- system.linux.system.repo.saltstack.trusty
+- system.linux.system.repo.mcp.apt_mirantis.cassandra
+- system.linux.system.repo.mcp.apt_mirantis.saltstack_2016_3
- system.opencontrail.client.resource.edge_router
- system.rabbitmq.server.cluster
- system.opencontrail.control.cluster
@@ -13,9 +13,10 @@
- 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.prometheus.exporters.jmx
-- cluster.virtual-mcp11-k8s-contrail.infra
+- cluster.virtual-mcp11-k8s-contrail
parameters:
_param:
openstack_version: mitaka
diff --git a/classes/cluster/virtual-mcp11-k8s-contrail/opencontrail/init.yml b/classes/cluster/virtual-mcp11-k8s-contrail/opencontrail/init.yml
index ad264cb..3ad59f2 100644
--- a/classes/cluster/virtual-mcp11-k8s-contrail/opencontrail/init.yml
+++ b/classes/cluster/virtual-mcp11-k8s-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