Fix horizon in mcp virtual labs
Change-Id: I13ec1e2386c777fa65231937a2082a049fc6c273
diff --git a/classes/cluster/os-aio-contrail/infra/config.yml b/classes/cluster/os-aio-contrail/infra/config.yml
index 9ff13c5..ebcbe3c 100755
--- a/classes/cluster/os-aio-contrail/infra/config.yml
+++ b/classes/cluster/os-aio-contrail/infra/config.yml
@@ -2,6 +2,7 @@
- service.git.client
- system.linux.system.single
- system.linux.system.repo.mcp.salt
+- system.linux.system.repo.mcp.openstack
- system.openssh.client.lab
- system.salt.master.api
- system.salt.master.pkg
@@ -54,7 +55,7 @@
site:
nginx_proxy_openstack_web:
proxy:
- host: ${_param:openstack_control_address}
+ host: ${_param:infra_config_address}
nginx_proxy_openstack_api_heat_cfn:
enabled: false
salt:
diff --git a/classes/cluster/os-aio-contrail/openstack/proxy.yml b/classes/cluster/os-aio-contrail/openstack/proxy.yml
index a4ea571..c0688c2 100755
--- a/classes/cluster/os-aio-contrail/openstack/proxy.yml
+++ b/classes/cluster/os-aio-contrail/openstack/proxy.yml
@@ -5,6 +5,7 @@
- system.nginx.server.proxy.openstack_vnc
- system.nginx.server.proxy.openstack_web
- system.salt.minion.cert.proxy
+- cluster.os-aio-contrail.openstack.dashboard
- cluster.os-aio-contrail
parameters:
_param:
diff --git a/classes/cluster/os-aio-ovs/infra/config.yml b/classes/cluster/os-aio-ovs/infra/config.yml
index cd1c00a..9447401 100644
--- a/classes/cluster/os-aio-ovs/infra/config.yml
+++ b/classes/cluster/os-aio-ovs/infra/config.yml
@@ -2,6 +2,7 @@
- service.git.client
- system.linux.system.single
- system.linux.system.repo.mcp.salt
+- system.linux.system.repo.mcp.openstack
- system.openssh.client.lab
- system.salt.master.api
- system.salt.master.pkg
@@ -54,7 +55,7 @@
site:
nginx_proxy_openstack_web:
proxy:
- host: ${_param:openstack_control_address}
+ host: ${_param:infra_config_address}
nginx_proxy_openstack_api_heat_cfn:
enabled: false
salt:
diff --git a/classes/cluster/os-aio-ovs/openstack/proxy.yml b/classes/cluster/os-aio-ovs/openstack/proxy.yml
index 132e382..142a984 100644
--- a/classes/cluster/os-aio-ovs/openstack/proxy.yml
+++ b/classes/cluster/os-aio-ovs/openstack/proxy.yml
@@ -4,6 +4,7 @@
- system.nginx.server.proxy.openstack_vnc
- system.nginx.server.proxy.openstack_web
- system.salt.minion.cert.proxy
+- cluster.os-aio-ovs.openstack.dashboard
- cluster.os-aio-ovs
parameters:
_param:
@@ -12,4 +13,4 @@
authority: ${_param:salt_minion_ca_authority}
engine: salt
mode: secure
- salt_minion_ca_host: cfg01.${_param:cluster_domain}
\ No newline at end of file
+ salt_minion_ca_host: cfg01.${_param:cluster_domain}
diff --git a/classes/cluster/os-ha-contrail/infra/config.yml b/classes/cluster/os-ha-contrail/infra/config.yml
index 3fec3ee..a96d05d 100755
--- a/classes/cluster/os-ha-contrail/infra/config.yml
+++ b/classes/cluster/os-ha-contrail/infra/config.yml
@@ -2,6 +2,7 @@
- service.git.client
- system.linux.system.single
- system.linux.system.repo.mcp.salt
+- system.linux.system.repo.mcp.openstack
- system.openssh.client.lab
- system.salt.master.api
- system.salt.master.pkg
@@ -61,7 +62,7 @@
site:
nginx_proxy_openstack_web:
proxy:
- host: ${_param:openstack_control_address}
+ host: ${_param:infra_config_address}
nginx_proxy_openstack_api_heat_cfn:
enabled: false
salt:
@@ -134,7 +135,6 @@
openstack_control_node01:
classes:
- service.galera.master.cluster
- - cluster.os-ha-contrail.openstack.dashboard
params:
mysql_cluster_role: master
linux_system_codename: xenial
@@ -142,7 +142,6 @@
openstack_control_node02:
classes:
- service.galera.slave.cluster
- - cluster.os-ha-contrail.openstack.dashboard
params:
mysql_cluster_role: slave
linux_system_codename: xenial
@@ -150,7 +149,6 @@
openstack_control_node03:
classes:
- service.galera.slave.cluster
- - cluster.os-ha-contrail.openstack.dashboard
params:
mysql_cluster_role: slave
linux_system_codename: xenial
diff --git a/classes/cluster/os-ha-contrail/openstack/dashboard.yml b/classes/cluster/os-ha-contrail/openstack/dashboard.yml
index 1be0a9c..1061456 100755
--- a/classes/cluster/os-ha-contrail/openstack/dashboard.yml
+++ b/classes/cluster/os-ha-contrail/openstack/dashboard.yml
@@ -3,7 +3,7 @@
- system.linux.system.repo.mcp.openstack
- system.linux.system.repo.mcp.extra
- system.linux.system.repo.saltstack.xenial
-- system.horizon.server.cluster
+- system.horizon.server.single
- system.horizon.server.plugin.contrail
- system.horizon.server.plugin.overrides
- cluster.os-ha-contrail
diff --git a/classes/cluster/os-ha-contrail/openstack/init.yml b/classes/cluster/os-ha-contrail/openstack/init.yml
index ee1eaef..a17a62b 100755
--- a/classes/cluster/os-ha-contrail/openstack/init.yml
+++ b/classes/cluster/os-ha-contrail/openstack/init.yml
@@ -1,8 +1,8 @@
parameters:
_param:
- openstack_proxy_hostname: prx
- openstack_proxy_address: ${_param:openstack_proxy_node01_address}
- openstack_proxy_node01_hostname: prx01
+ openstack_proxy_hostname: cfg
+ openstack_proxy_address: ${_param:infra_config_address}
+ openstack_proxy_node01_hostname: cfg01
openstack_proxy_node01_address: ${_param:infra_config_address}
openstack_control_address: 172.16.10.254
diff --git a/classes/cluster/os-ha-contrail/openstack/proxy.yml b/classes/cluster/os-ha-contrail/openstack/proxy.yml
index 37a9234..f3dc4f1 100755
--- a/classes/cluster/os-ha-contrail/openstack/proxy.yml
+++ b/classes/cluster/os-ha-contrail/openstack/proxy.yml
@@ -6,6 +6,7 @@
- system.nginx.server.proxy.openstack_web
- system.nginx.server.proxy.openstack.barbican
- system.salt.minion.cert.proxy
+- cluster.os-ha-contrail.openstack.dashboard
- cluster.os-ha-contrail
parameters:
_param:
diff --git a/classes/cluster/os-ha-ovs/infra/config.yml b/classes/cluster/os-ha-ovs/infra/config.yml
index 2273e6a..a7d91a2 100644
--- a/classes/cluster/os-ha-ovs/infra/config.yml
+++ b/classes/cluster/os-ha-ovs/infra/config.yml
@@ -2,6 +2,7 @@
- service.git.client
- system.linux.system.single
- system.linux.system.repo.mcp.salt
+- system.linux.system.repo.mcp.openstack
- system.openssh.client.lab
- system.salt.master.api
- system.salt.master.pkg
@@ -60,7 +61,7 @@
site:
nginx_proxy_openstack_web:
proxy:
- host: ${_param:openstack_control_address}
+ host: ${_param:infra_config_address}
nginx_proxy_openstack_api_heat_cfn:
enabled: false
salt:
diff --git a/classes/cluster/os-ha-ovs/openstack/dashboard.yml b/classes/cluster/os-ha-ovs/openstack/dashboard.yml
index 6842cbf..45f54f8 100644
--- a/classes/cluster/os-ha-ovs/openstack/dashboard.yml
+++ b/classes/cluster/os-ha-ovs/openstack/dashboard.yml
@@ -3,7 +3,7 @@
- system.linux.system.repo.mcp.openstack
- system.linux.system.repo.mcp.extra
- system.linux.system.repo.saltstack.xenial
-- system.horizon.server.cluster
+- system.horizon.server.single
- cluster.os-ha-ovs
parameters:
_param:
diff --git a/classes/cluster/os-ha-ovs/openstack/init.yml b/classes/cluster/os-ha-ovs/openstack/init.yml
index 38e2c1e..b2610bf 100644
--- a/classes/cluster/os-ha-ovs/openstack/init.yml
+++ b/classes/cluster/os-ha-ovs/openstack/init.yml
@@ -1,8 +1,8 @@
parameters:
_param:
- openstack_proxy_hostname: prx
- openstack_proxy_address: ${_param:openstack_proxy_node01_address}
- openstack_proxy_node01_hostname: prx01
+ openstack_proxy_hostname: cfg
+ openstack_proxy_address: ${_param:infra_config_address}
+ openstack_proxy_node01_hostname: cfg01
openstack_proxy_node01_address: ${_param:infra_config_address}
openstack_control_hostname: ctl
openstack_control_node01_hostname: ctl01
diff --git a/classes/cluster/os-ha-ovs/openstack/proxy.yml b/classes/cluster/os-ha-ovs/openstack/proxy.yml
index bb775ca..1f296ae 100644
--- a/classes/cluster/os-ha-ovs/openstack/proxy.yml
+++ b/classes/cluster/os-ha-ovs/openstack/proxy.yml
@@ -4,6 +4,7 @@
- system.nginx.server.proxy.openstack_vnc
- system.nginx.server.proxy.openstack_web
- system.salt.minion.cert.proxy
+- cluster.os-ha-ovs.openstack.dashboard
- cluster.os-ha-ovs
parameters:
_param:
@@ -12,4 +13,4 @@
authority: ${_param:salt_minion_ca_authority}
engine: salt
mode: secure
- salt_minion_ca_host: cfg01.${_param:cluster_domain}
\ No newline at end of file
+ salt_minion_ca_host: cfg01.${_param:cluster_domain}