Merge "Add class mapping for opencontrail version"
diff --git a/classes/cluster/drivetrain-ha-clusters/cicd/control/master.yml b/classes/cluster/drivetrain-ha-clusters/cicd/control/master.yml
index b02ce35..7b74e37 100644
--- a/classes/cluster/drivetrain-ha-clusters/cicd/control/master.yml
+++ b/classes/cluster/drivetrain-ha-clusters/cicd/control/master.yml
@@ -33,7 +33,7 @@
# Elasticsearch
- system.elasticsearch.client
- system.elasticsearch.client.index.pushkin
- - system.elasticsearch.client.index.janitor_monkey
+ - system.elasticsearch.client.index.cis_openstack
# DevOps Portal
- service.devops_portal.config
diff --git a/classes/cluster/drivetrain-ha/cicd/control/master.yml b/classes/cluster/drivetrain-ha/cicd/control/master.yml
index 3a84699..21abc74 100644
--- a/classes/cluster/drivetrain-ha/cicd/control/master.yml
+++ b/classes/cluster/drivetrain-ha/cicd/control/master.yml
@@ -33,7 +33,7 @@
# Elasticsearch
- system.elasticsearch.client
- system.elasticsearch.client.index.pushkin
- - system.elasticsearch.client.index.janitor_monkey
+ - system.elasticsearch.client.index.cis_openstack
# DevOps Portal
- service.devops_portal.config
diff --git a/classes/cluster/os-ha-contrail/opencontrail/control.yml b/classes/cluster/os-ha-contrail/opencontrail/control.yml
index 64cb921..fc3b493 100644
--- a/classes/cluster/os-ha-contrail/opencontrail/control.yml
+++ b/classes/cluster/os-ha-contrail/opencontrail/control.yml
@@ -66,3 +66,13 @@
engine: rabbitmq
host: ${_param:openstack_control_address}
port: 5672
+ client:
+ virtual_networks:
+ network01:
+ name: 'floating-ips'
+ ip_prefix: '172.16.111.0'
+ ip_prefix_len: 24
+ asn: 64512
+ route_target: 10000
+ external: True
+ rpf: 'disable'
diff --git a/classes/system b/classes/system
index beffa36..89681a6 160000
--- a/classes/system
+++ b/classes/system
@@ -1 +1 @@
-Subproject commit beffa36e11d3f4791286c99d8e720a8635f1267e
+Subproject commit 89681a669330a40caecbae05ee8ba4504d0945c7