Update sl-os-contrail model to ocata
Change-Id: Iee4c367102ced269ef20752a6398494a35f03058
diff --git a/classes/cluster/sl-os-contrail/opencontrail/control.yml b/classes/cluster/sl-os-contrail/opencontrail/control.yml
index 314d968..7c5e60b 100644
--- a/classes/cluster/sl-os-contrail/opencontrail/control.yml
+++ b/classes/cluster/sl-os-contrail/opencontrail/control.yml
@@ -4,7 +4,7 @@
- system.linux.system.repo.mcp.contrail
- system.linux.system.repo.mcp.openstack
- system.linux.system.repo.mcp.extra
-- system.linux.system.repo.saltstack.xenial
+- system.linux.system.repo.saltstack.trusty
- system.opencontrail.client.resource.edge_router
- system.opencontrail.control.cluster
- system.opencontrail.client.cluster
@@ -13,6 +13,7 @@
- system.opencontrail.client.resource.database_node
- system.opencontrail.client.resource.analytics_node
- system.haproxy.proxy.listen.opencontrail.analytics
+- system.prometheus.exporters.jmx
- cluster.sl-os-contrail
parameters:
_param:
diff --git a/classes/cluster/sl-os-contrail/opencontrail/init.yml b/classes/cluster/sl-os-contrail/opencontrail/init.yml
index cee0b50..7e1e78c 100644
--- a/classes/cluster/sl-os-contrail/opencontrail/init.yml
+++ b/classes/cluster/sl-os-contrail/opencontrail/init.yml
@@ -34,4 +34,4 @@
address: ${_param:opencontrail_control_node03_address}
names:
- ${_param:opencontrail_control_node03_hostname}
- - ${_param:opencontrail_control_node03_hostname}.${_param:cluster_domain}
\ No newline at end of file
+ - ${_param:opencontrail_control_node03_hostname}.${_param:cluster_domain}