Update ocata-cicd model according to changes in cookiecutter
Changes taken from:
cicd: https://gerrit.mcp.mirantis.net/#/c/6751/2
stacklight: taken from virtual-mcp11-k8s-calico/stacklight
Change-Id: I9fa7a0ab76f943b96293584b3f52765965f3b906
diff --git a/classes/cluster/virtual-mcp-ocata-cicd/openstack/compute/init.yml b/classes/cluster/virtual-mcp-ocata-cicd/openstack/compute.yml
similarity index 97%
rename from classes/cluster/virtual-mcp-ocata-cicd/openstack/compute/init.yml
rename to classes/cluster/virtual-mcp-ocata-cicd/openstack/compute.yml
index fa86c96..fb66a2f 100644
--- a/classes/cluster/virtual-mcp-ocata-cicd/openstack/compute/init.yml
+++ b/classes/cluster/virtual-mcp-ocata-cicd/openstack/compute.yml
@@ -5,7 +5,7 @@
- system.nova.compute.cluster
- system.neutron.compute.cluster
- system.heka.alarm.openstack_compute
-- cluster.virtual-mcp-ocata-cicd
+- cluster.virtual-mcp-ocata-cicd.infra
parameters:
_param:
primary_interface: ens4
diff --git a/classes/cluster/virtual-mcp-ocata-cicd/openstack/control.yml b/classes/cluster/virtual-mcp-ocata-cicd/openstack/control.yml
index 8f91b30..2241bae 100644
--- a/classes/cluster/virtual-mcp-ocata-cicd/openstack/control.yml
+++ b/classes/cluster/virtual-mcp-ocata-cicd/openstack/control.yml
@@ -34,7 +34,7 @@
- system.galera.server.database.nova
- system.galera.server.database.designate
- system.haproxy.proxy.listen.openstack.nova-placement
-- cluster.virtual-mcp-ocata-cicd
+- cluster.virtual-mcp-ocata-cicd.infra
parameters:
_param:
keepalived_vip_interface: ens4
diff --git a/classes/cluster/virtual-mcp-ocata-cicd/openstack/dashboard.yml b/classes/cluster/virtual-mcp-ocata-cicd/openstack/dashboard.yml
index ca28d66..665229e 100644
--- a/classes/cluster/virtual-mcp-ocata-cicd/openstack/dashboard.yml
+++ b/classes/cluster/virtual-mcp-ocata-cicd/openstack/dashboard.yml
@@ -4,7 +4,7 @@
- system.linux.system.repo.mcp.extra
- system.linux.system.repo.saltstack.xenial
- system.horizon.server.single
-- cluster.virtual-mcp-ocata-cicd
+- cluster.virtual-mcp-ocata-cicd.infra
parameters:
_param:
horizon_site_branding: OpenStack Dashboard
diff --git a/classes/cluster/virtual-mcp-ocata-cicd/openstack/gateway.yml b/classes/cluster/virtual-mcp-ocata-cicd/openstack/gateway.yml
index ff8f085..9cf601b 100644
--- a/classes/cluster/virtual-mcp-ocata-cicd/openstack/gateway.yml
+++ b/classes/cluster/virtual-mcp-ocata-cicd/openstack/gateway.yml
@@ -3,7 +3,7 @@
- system.linux.system.repo.mcp.extra
- system.linux.system.repo.saltstack.xenial
- system.neutron.gateway.cluster
-- cluster.virtual-mcp-ocata-cicd
+- cluster.virtual-mcp-ocata-cicd.infra
parameters:
_param:
primary_interface: ens4
diff --git a/classes/cluster/virtual-mcp-ocata-cicd/openstack/init.yml b/classes/cluster/virtual-mcp-ocata-cicd/openstack/init.yml
index cd42a02..100bcd8 100644
--- a/classes/cluster/virtual-mcp-ocata-cicd/openstack/init.yml
+++ b/classes/cluster/virtual-mcp-ocata-cicd/openstack/init.yml
@@ -114,6 +114,21 @@
mongodb_ceilometer_password: cloudlab
mongodb_admin_password: cloudlab
mongodb_shared_key: eoTh1AwahlahqueingeejooLughah4tei9feing0eeVaephooDi2li1TaeV1ooth
+
+ # 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}
+ openstack_gateway_address: 172.16.10.110
+
linux:
network:
host:
diff --git a/classes/cluster/virtual-mcp-ocata-cicd/openstack/proxy.yml b/classes/cluster/virtual-mcp-ocata-cicd/openstack/proxy.yml
index 8dbf3c4..114f5a9 100644
--- a/classes/cluster/virtual-mcp-ocata-cicd/openstack/proxy.yml
+++ b/classes/cluster/virtual-mcp-ocata-cicd/openstack/proxy.yml
@@ -4,7 +4,7 @@
- system.nginx.server.proxy.openstack_vnc
- system.nginx.server.proxy.openstack_web
- system.salt.minion.cert.proxy
-- cluster.virtual-mcp-ocata-cicd
+- cluster.virtual-mcp-ocata-cicd.infra
parameters:
_param:
linux_system_codename: xenial