Fix virtual-mcp11-contrail model
This change makes sure that cluster_domain is taken from
classes/cluster/overrides.yml and not the local init.yml file.
Change-Id: I52c046ecfc06cd051bfa0092e500c4fb6043b639
diff --git a/classes/cluster/virtual-mcp11-contrail/infra/init.yml b/classes/cluster/virtual-mcp11-contrail/infra/init.yml
index 9140bd0..b6a6cc2 100755
--- a/classes/cluster/virtual-mcp11-contrail/infra/init.yml
+++ b/classes/cluster/virtual-mcp11-contrail/infra/init.yml
@@ -1,4 +1,8 @@
parameters:
+ _param:
+ cluster_domain: virtual-mcp11-contrail.local
+ cluster_name: virtual-mcp11-contrail
+ infra_config_address: 172.16.10.100
linux:
network:
host:
diff --git a/classes/cluster/virtual-mcp11-contrail/init.yml b/classes/cluster/virtual-mcp11-contrail/init.yml
index 613edb9..772947e 100755
--- a/classes/cluster/virtual-mcp11-contrail/init.yml
+++ b/classes/cluster/virtual-mcp11-contrail/init.yml
@@ -12,77 +12,7 @@
- system.prometheus.collector
- system.telegraf.agent
- cluster.virtual-mcp11-contrail.infra
+- cluster.virtual-mcp11-contrail.opencontrail
- cluster.virtual-mcp11-contrail.openstack
- cluster.virtual-mcp11-contrail.stacklight
- cluster.overrides
-parameters:
- _param:
- cluster_domain: virtual-mcp11-contrail.local
- cluster_name: virtual-mcp11-contrail
-
- # infra service addresses
- infra_config_address: 172.16.10.100
-
- # openstack service addresses
- openstack_proxy_address: 172.16.10.121
- openstack_proxy_node01_address: 172.16.10.121
-
- openstack_control_address: 172.16.10.254
- openstack_control_node01_address: 172.16.10.101
- openstack_control_node02_address: 172.16.10.102
- openstack_control_node03_address: 172.16.10.103
-
- openstack_database_address: ${_param:openstack_control_address}
- openstack_database_node01_address: ${_param:openstack_control_node01_address}
- openstack_database_node02_address: ${_param:openstack_control_node02_address}
- openstack_database_node03_address: ${_param:openstack_control_node02_address}
-
- openstack_message_queue_address: ${_param:openstack_control_address}
- openstack_message_queue_node01_address: ${_param:openstack_control_node01_address}
- openstack_message_queue_node02_address: ${_param:openstack_control_node02_address}
- openstack_message_queue_node03_address: ${_param:openstack_control_node03_address}
-
- # opencontrail service addresses
- opencontrail_analytics_address: ${_param:openstack_control_address}
- opencontrail_analytics_node01_address: ${_param:openstack_control_node01_address}
- opencontrail_analytics_node02_address: ${_param:openstack_control_node02_address}
- opencontrail_analytics_node03_address: ${_param:openstack_control_node03_address}
-
- opencontrail_control_address: 172.16.10.252
- opencontrail_control_node01_address: 172.16.10.111
- opencontrail_control_node02_address: 172.16.10.112
- opencontrail_control_node03_address: 172.16.10.113
-
- # stacklight service addresses
- stacklight_monitor_address: 172.16.10.253
- stacklight_monitor_node01_address: 172.16.10.107
- stacklight_monitor_node02_address: 172.16.10.108
- stacklight_monitor_node03_address: 172.16.10.109
-
- stacklight_log_address: ${_param:stacklight_monitor_address}
- stacklight_telemetry_address: ${_param:stacklight_monitor_address}
- stacklight_telemetry_node01_address: ${_param:stacklight_monitor_node01_address}
-
- linux:
- network:
- host:
- ntw:
- address: ${_param:opencontrail_control_address}
- names:
- - ntw
- - ntw.${_param:cluster_domain}
- ntw01:
- address: ${_param:opencontrail_control_node01_address}
- names:
- - ntw01
- - ntw01.${_param:cluster_domain}
- ntw02:
- address: ${_param:opencontrail_control_node02_address}
- names:
- - ntw02
- - ntw02.${_param:cluster_domain}
- ntw03:
- address: ${_param:opencontrail_control_node03_address}
- names:
- - ntw03
- - ntw03.${_param:cluster_domain}
\ No newline at end of file
diff --git a/classes/cluster/virtual-mcp11-contrail/opencontrail/init.yml b/classes/cluster/virtual-mcp11-contrail/opencontrail/init.yml
new file mode 100644
index 0000000..cee0b50
--- /dev/null
+++ b/classes/cluster/virtual-mcp11-contrail/opencontrail/init.yml
@@ -0,0 +1,37 @@
+parameters:
+ _param:
+ opencontrail_analytics_address: ${_param:openstack_control_address}
+ opencontrail_analytics_node01_address: ${_param:openstack_control_node01_address}
+ opencontrail_analytics_node02_address: ${_param:openstack_control_node02_address}
+ opencontrail_analytics_node03_address: ${_param:openstack_control_node03_address}
+
+ opencontrail_control_address: 172.16.10.252
+ opencontrail_control_node01_hostname: ntw01
+ opencontrail_control_node02_hostname: ntw02
+ opencontrail_control_node03_hostname: ntw03
+ opencontrail_control_node01_address: 172.16.10.111
+ opencontrail_control_node02_address: 172.16.10.112
+ opencontrail_control_node03_address: 172.16.10.113
+ linux:
+ network:
+ host:
+ ntw:
+ address: ${_param:opencontrail_control_address}
+ names:
+ - ntw
+ - ntw.${_param:cluster_domain}
+ ntw01:
+ address: ${_param:opencontrail_control_node01_address}
+ names:
+ - ${_param:opencontrail_control_node01_hostname}
+ - ${_param:opencontrail_control_node01_hostname}.${_param:cluster_domain}
+ ntw02:
+ address: ${_param:opencontrail_control_node02_address}
+ names:
+ - ${_param:opencontrail_control_node02_hostname}
+ - ${_param:opencontrail_control_node02_hostname}.${_param:cluster_domain}
+ ntw03:
+ 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
diff --git a/classes/cluster/virtual-mcp11-contrail/openstack/init.yml b/classes/cluster/virtual-mcp11-contrail/openstack/init.yml
index f673ab7..97bfab7 100755
--- a/classes/cluster/virtual-mcp11-contrail/openstack/init.yml
+++ b/classes/cluster/virtual-mcp11-contrail/openstack/init.yml
@@ -1,5 +1,19 @@
parameters:
_param:
+ openstack_proxy_address: 172.16.10.121
+ openstack_proxy_node01_address: 172.16.10.121
+ openstack_control_address: 172.16.10.254
+ openstack_control_node01_address: 172.16.10.101
+ openstack_control_node02_address: 172.16.10.102
+ openstack_control_node03_address: 172.16.10.103
+ openstack_database_address: ${_param:openstack_control_address}
+ openstack_database_node01_address: ${_param:openstack_control_node01_address}
+ openstack_database_node02_address: ${_param:openstack_control_node02_address}
+ openstack_database_node03_address: ${_param:openstack_control_node02_address}
+ openstack_message_queue_address: ${_param:openstack_control_address}
+ openstack_message_queue_node01_address: ${_param:openstack_control_node01_address}
+ openstack_message_queue_node02_address: ${_param:openstack_control_node02_address}
+ openstack_message_queue_node03_address: ${_param:openstack_control_node03_address}
openstack_version: ocata
apt_mk_version: nightly
openstack_region: RegionOne
diff --git a/classes/cluster/virtual-mcp11-contrail/stacklight/init.yml b/classes/cluster/virtual-mcp11-contrail/stacklight/init.yml
index 0b10c03..f30d6e4 100755
--- a/classes/cluster/virtual-mcp11-contrail/stacklight/init.yml
+++ b/classes/cluster/virtual-mcp11-contrail/stacklight/init.yml
@@ -1,5 +1,12 @@
parameters:
_param:
+ stacklight_monitor_address: 172.16.10.253
+ stacklight_monitor_node01_address: 172.16.10.107
+ stacklight_monitor_node02_address: 172.16.10.108
+ stacklight_monitor_node03_address: 172.16.10.109
+ stacklight_log_address: ${_param:stacklight_monitor_address}
+ stacklight_telemetry_address: ${_param:stacklight_monitor_address}
+ stacklight_telemetry_node01_address: ${_param:stacklight_monitor_node01_address}
prometheus_control_address: ${_param:stacklight_monitor_address}
heka_elasticsearch_host: ${_param:stacklight_monitor_address}
elasticsearch_port: 9200