Reclass fixes for new lab models
Change-Id: If53b0255df4a5aeb37255e82baed893419e2dd6b
diff --git a/classes/cluster/os_aio_ovs/openstack/init.yml b/classes/cluster/os_aio_ovs/openstack/init.yml
index e0f6e3c..5226be4 100644
--- a/classes/cluster/os_aio_ovs/openstack/init.yml
+++ b/classes/cluster/os_aio_ovs/openstack/init.yml
@@ -12,7 +12,7 @@
openstack_message_queue_node02_address: ${_param:openstack_control_node02_address}
openstack_message_queue_node03_address: ${_param:openstack_control_node03_address}
- openstack_version: newton
+ openstack_version: ocata
apt_mk_version: nightly
mcp_repo_version: 1.1
openstack_region: RegionOne
diff --git a/classes/cluster/os_ha_ovs/infra/config.yml b/classes/cluster/os_ha_ovs/infra/config.yml
index 6975e0d..4161e85 100644
--- a/classes/cluster/os_ha_ovs/infra/config.yml
+++ b/classes/cluster/os_ha_ovs/infra/config.yml
@@ -17,7 +17,6 @@
- system.mysql.client.single
- system.reclass.storage.system.openstack_control_cluster
- system.reclass.storage.system.openstack_compute_multi
-- system.reclass.storage.system.openstack_gateway_single
- system.reclass.storage.system.openstack_dashboard_single
- cluster.os_ha_ovs.openstack.proxy
- cluster.os_ha_ovs
@@ -81,10 +80,6 @@
single_address: 172.16.10.106
tenant_address: 10.1.0.106
external_address: 10.16.0.106
- openstack_gateway_node01:
- params:
- tenant_address: 10.1.0.110
- external_address: 10.16.0.110
openstack_proxy_node01:
classes:
- cluster.os_ha_ovs.openstack.proxy
diff --git a/classes/cluster/os_ha_ovs/openstack/init.yml b/classes/cluster/os_ha_ovs/openstack/init.yml
index e0f6e3c..62e9b94 100644
--- a/classes/cluster/os_ha_ovs/openstack/init.yml
+++ b/classes/cluster/os_ha_ovs/openstack/init.yml
@@ -1,4 +1,4 @@
-arameters:
+parameters:
_param:
openstack_proxy_address: 172.16.10.121
openstack_proxy_node01_address: 172.16.10.121
@@ -12,7 +12,7 @@
openstack_message_queue_node02_address: ${_param:openstack_control_node02_address}
openstack_message_queue_node03_address: ${_param:openstack_control_node03_address}
- openstack_version: newton
+ openstack_version: ocata
apt_mk_version: nightly
mcp_repo_version: 1.1
openstack_region: RegionOne
@@ -128,11 +128,6 @@
names:
- ctl03
- ctl03.${_param:cluster_domain}
- gtw01:
- address: ${_param:openstack_gateway_address}
- names:
- - gtw01
- - gtw01.${_param:cluster_domain}
cmp01:
address: 172.16.10.105
names:
diff --git a/classes/cluster/sl_k8s_calico/stacklight/server.yml b/classes/cluster/sl_k8s_calico/stacklight/server.yml
index fd5ade9..bef849f 100644
--- a/classes/cluster/sl_k8s_calico/stacklight/server.yml
+++ b/classes/cluster/sl_k8s_calico/stacklight/server.yml
@@ -45,7 +45,7 @@
# Kibana
kibana_elasticsearch_host: ${_param:cluster_vip_address}
# Galera
- openstack_version: newton
+ openstack_version: ocata
# Grafana
docker_grafana_replicas: 1
grafana_database_type: mysql
diff --git a/classes/cluster/sl_k8s_contrail/stacklight/server.yml b/classes/cluster/sl_k8s_contrail/stacklight/server.yml
index 9f836b3..be7150d 100644
--- a/classes/cluster/sl_k8s_contrail/stacklight/server.yml
+++ b/classes/cluster/sl_k8s_contrail/stacklight/server.yml
@@ -45,7 +45,7 @@
keepalived_prometheus_vip_password: password
keepalived_prometheus_vip_interface: ens4
# Galera
- openstack_version: newton
+ openstack_version: ocata
# Grafana
grafana_database_type: mysql
grafana_database_host: ${_param:cluster_vip_address}
diff --git a/classes/cluster/sl_os_ovs/openstack/init.yml b/classes/cluster/sl_os_ovs/openstack/init.yml
index e2f6cf2..7cf7570 100644
--- a/classes/cluster/sl_os_ovs/openstack/init.yml
+++ b/classes/cluster/sl_os_ovs/openstack/init.yml
@@ -12,7 +12,7 @@
openstack_message_queue_node02_address: ${_param:openstack_control_node02_address}
openstack_message_queue_node03_address: ${_param:openstack_control_node03_address}
- openstack_version: newton
+ openstack_version: ocata
apt_mk_version: nightly
mcp_repo_version: 1.1
openstack_region: RegionOne