Merge "Fix virtual-mcp11-ovs model"
diff --git a/classes/cluster/virtual-mcp11-dvr/infra/init.yml b/classes/cluster/virtual-mcp11-dvr/infra/init.yml
index a698511..f0cfd07 100644
--- a/classes/cluster/virtual-mcp11-dvr/infra/init.yml
+++ b/classes/cluster/virtual-mcp11-dvr/infra/init.yml
@@ -1,5 +1,4 @@
parameters:
-parameters:
_param:
cluster_domain: virtual-mcp11-dvr.local
cluster_name: virtual-mcp11-dvr
diff --git a/classes/cluster/virtual-mcp11-ovs/infra/init.yml b/classes/cluster/virtual-mcp11-ovs/infra/init.yml
index 9140bd0..be51f48 100644
--- a/classes/cluster/virtual-mcp11-ovs/infra/init.yml
+++ b/classes/cluster/virtual-mcp11-ovs/infra/init.yml
@@ -1,4 +1,8 @@
parameters:
+ _param:
+ cluster_domain: virtual-mcp11-ovs.local
+ cluster_name: virtual-mcp11-ovs
+ infra_config_address: 172.16.10.100
linux:
network:
host:
diff --git a/classes/cluster/virtual-mcp11-ovs/init.yml b/classes/cluster/virtual-mcp11-ovs/init.yml
index 0516e5b..2f85ae8 100644
--- a/classes/cluster/virtual-mcp11-ovs/init.yml
+++ b/classes/cluster/virtual-mcp11-ovs/init.yml
@@ -8,32 +8,4 @@
- system.openssh.server.team.mcp_qa
- cluster.virtual-mcp11-ovs.stacklight
- cluster.virtual-mcp11-ovs.stacklight.client
-
-parameters:
- _param:
- cluster_domain: virtual-mcp11-ovs.local
- cluster_name: virtual-mcp11-ovs
- # 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_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}
- # 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_telemetry_node01_address: ${_param:stacklight_monitor_node01_address}
- stacklight_log_address: ${_param:stacklight_monitor_address}
- openstack_gateway_address: 172.16.10.110
- openstack_gateway_node01_address: ${_param:openstack_gateway_address}
- stacklight_telemetry_address: ${_param:stacklight_monitor_address}
\ No newline at end of file
+- cluster.overrides
\ No newline at end of file
diff --git a/classes/cluster/virtual-mcp11-ovs/openstack/init.yml b/classes/cluster/virtual-mcp11-ovs/openstack/init.yml
index bb1caaf..f78b91c 100644
--- a/classes/cluster/virtual-mcp11-ovs/openstack/init.yml
+++ b/classes/cluster/virtual-mcp11-ovs/openstack/init.yml
@@ -1,5 +1,18 @@
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_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_gateway_address: 172.16.10.110
+ openstack_gateway_node01_address: ${_param:openstack_gateway_address}
openstack_version: newton
apt_mk_version: nightly
mcp_repo_version: 1.1
diff --git a/classes/cluster/virtual-mcp11-ovs/stacklight/init.yml b/classes/cluster/virtual-mcp11-ovs/stacklight/init.yml
index 48bffdc..09481dc 100644
--- a/classes/cluster/virtual-mcp11-ovs/stacklight/init.yml
+++ b/classes/cluster/virtual-mcp11-ovs/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_telemetry_node01_address: ${_param:stacklight_monitor_node01_address}
+ stacklight_log_address: ${_param:stacklight_monitor_address}
+ stacklight_telemetry_address: ${_param:stacklight_monitor_address}
heka_elasticsearch_host: ${_param:stacklight_monitor_address}
heka_influxdb_host: ${_param:stacklight_monitor_node01_address}
heka_aggregator_host: ${_param:stacklight_monitor_address}