Merge "Bump reclass in static models"
diff --git a/classes/cluster/os-ha-contrail-40/openstack/init.yml b/classes/cluster/os-ha-contrail-40/openstack/init.yml
index bc03cd1..f4221be 100644
--- a/classes/cluster/os-ha-contrail-40/openstack/init.yml
+++ b/classes/cluster/os-ha-contrail-40/openstack/init.yml
@@ -90,6 +90,7 @@
cinder_service_host: ${_param:openstack_control_address}
nova_version: ${_param:openstack_version}
nova_service_host: ${_param:openstack_control_address}
+ placement_service_host: ${_param:openstack_control_address}
nova_vncproxy_url: http://${_param:openstack_control_address}:8060
neutron_version: ${_param:openstack_version}
neutron_service_host: ${_param:openstack_control_address}
diff --git a/classes/cluster/os-ha-contrail/openstack/init.yml b/classes/cluster/os-ha-contrail/openstack/init.yml
index e840320..0dea60c 100755
--- a/classes/cluster/os-ha-contrail/openstack/init.yml
+++ b/classes/cluster/os-ha-contrail/openstack/init.yml
@@ -91,6 +91,7 @@
cinder_service_host: ${_param:openstack_control_address}
nova_version: ${_param:openstack_version}
nova_service_host: ${_param:openstack_control_address}
+ placement_service_host: ${_param:openstack_control_address}
nova_vncproxy_url: http://${_param:openstack_control_address}:8060
neutron_version: ${_param:openstack_version}
neutron_service_host: ${_param:openstack_control_address}
diff --git a/classes/cluster/sl-os-contrail/openstack/init.yml b/classes/cluster/sl-os-contrail/openstack/init.yml
index c600e35..27d7fe2 100755
--- a/classes/cluster/sl-os-contrail/openstack/init.yml
+++ b/classes/cluster/sl-os-contrail/openstack/init.yml
@@ -77,6 +77,7 @@
ceilometer_graphite_publisher_port: 2013
nova_version: ${_param:openstack_version}
nova_service_host: ${_param:openstack_control_address}
+ placement_service_host: ${_param:openstack_control_address}
nova_vncproxy_url: http://${_param:openstack_control_address}:8060
neutron_version: ${_param:openstack_version}
neutron_service_host: ${_param:openstack_control_address}
diff --git a/classes/cluster/sl-os-ovs/openstack/init.yml b/classes/cluster/sl-os-ovs/openstack/init.yml
index e8ad2c3..2ba6521 100644
--- a/classes/cluster/sl-os-ovs/openstack/init.yml
+++ b/classes/cluster/sl-os-ovs/openstack/init.yml
@@ -66,6 +66,7 @@
cinder_service_host: ${_param:cluster_vip_address}
nova_version: ${_param:openstack_version}
nova_service_host: ${_param:cluster_vip_address}
+ placement_service_host: ${_param:cluster_vip_address}
nova_vncproxy_url: http://${_param:cluster_vip_address}:8060
neutron_version: ${_param:openstack_version}
neutron_service_host: ${_param:cluster_vip_address}
diff --git a/classes/cluster/sl-pike-dvr/openstack/init.yml b/classes/cluster/sl-pike-dvr/openstack/init.yml
index 715546d..5444af9 100644
--- a/classes/cluster/sl-pike-dvr/openstack/init.yml
+++ b/classes/cluster/sl-pike-dvr/openstack/init.yml
@@ -87,6 +87,7 @@
ceilometer_graphite_publisher_port: 2013
nova_version: ${_param:openstack_version}
nova_service_host: ${_param:cluster_vip_address}
+ placement_service_host: ${_param:cluster_vip_address}
nova_vncproxy_url: http://${_param:cluster_vip_address}:8060
neutron_version: ${_param:openstack_version}
neutron_service_host: ${_param:cluster_vip_address}
diff --git a/classes/cluster/virtual-mcp-mitaka-dvr-trusty/openstack/init.yml b/classes/cluster/virtual-mcp-mitaka-dvr-trusty/openstack/init.yml
index 67256b5..db42f3e 100644
--- a/classes/cluster/virtual-mcp-mitaka-dvr-trusty/openstack/init.yml
+++ b/classes/cluster/virtual-mcp-mitaka-dvr-trusty/openstack/init.yml
@@ -111,6 +111,7 @@
ceilometer_graphite_publisher_port: 2013
nova_version: ${_param:openstack_version}
nova_service_host: ${_param:cluster_vip_address}
+ placement_service_host: ${_param:cluster_vip_address}
nova_vncproxy_url: http://${_param:cluster_vip_address}:8060
neutron_version: ${_param:openstack_version}
neutron_service_host: ${_param:cluster_vip_address}
diff --git a/classes/cluster/virtual-mcp-mitaka-ovs-trusty/openstack/init.yml b/classes/cluster/virtual-mcp-mitaka-ovs-trusty/openstack/init.yml
index e0cf2f1..e30c3c1 100644
--- a/classes/cluster/virtual-mcp-mitaka-ovs-trusty/openstack/init.yml
+++ b/classes/cluster/virtual-mcp-mitaka-ovs-trusty/openstack/init.yml
@@ -104,6 +104,7 @@
ceilometer_graphite_publisher_port: 2013
nova_version: ${_param:openstack_version}
nova_service_host: ${_param:cluster_vip_address}
+ placement_service_host: ${_param:cluster_vip_address}
nova_vncproxy_url: http://${_param:cluster_vip_address}:8060
neutron_version: ${_param:openstack_version}
neutron_service_host: ${_param:cluster_vip_address}
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/init.yml b/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/init.yml
index 017a30d..5b30f25 100644
--- a/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/init.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/init.yml
@@ -173,6 +173,7 @@
panko_public_host: ${_param:telemetry_public_host}
nova_version: ${_param:openstack_version}
nova_service_host: ${_param:cluster_vip_address}
+ placement_service_host: ${_param:cluster_vip_address}
nova_vncproxy_url: http://${_param:cluster_vip_address}:8060
neutron_version: ${_param:openstack_version}
neutron_service_host: ${_param:cluster_vip_address}
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/proxy.yml b/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/proxy.yml
index 5f2682b..b8fdbad 100644
--- a/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/proxy.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/proxy.yml
@@ -14,6 +14,9 @@
enabled: true
authority: ${_param:salt_minion_ca_authority}
salt_minion_ca_host: cfg01.${linux:system:domain}
+ nginx_proxy_openstack_api_address: ${_param:cluster_local_address}
+ nginx_proxy_openstack_placement_host: 127.0.0.1
+ nginx_proxy_openstack_placement_protocol: ${_param:cluster_public_protocol}
nginx:
server:
site:
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/init.yml b/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/init.yml
index dc0111d..c0aa559 100644
--- a/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/init.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/init.yml
@@ -172,6 +172,7 @@
panko_public_host: ${_param:telemetry_public_host}
nova_version: ${_param:openstack_version}
nova_service_host: ${_param:cluster_vip_address}
+ placement_service_host: ${_param:cluster_vip_address}
nova_vncproxy_url: http://${_param:cluster_vip_address}:8060
neutron_version: ${_param:openstack_version}
neutron_service_host: ${_param:cluster_vip_address}
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/proxy.yml b/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/proxy.yml
index b715bfe..1069bce 100644
--- a/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/proxy.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/proxy.yml
@@ -14,6 +14,9 @@
enabled: true
authority: ${_param:salt_minion_ca_authority}
salt_minion_ca_host: cfg01.${linux:system:domain}
+ nginx_proxy_openstack_api_address: ${_param:cluster_local_address}
+ nginx_proxy_openstack_placement_host: 127.0.0.1
+ nginx_proxy_openstack_placement_protocol: ${_param:cluster_public_protocol}
nginx:
server:
site:
diff --git a/classes/cluster/virtual-mcp-pike-dvr/openstack/init.yml b/classes/cluster/virtual-mcp-pike-dvr/openstack/init.yml
index 7ee55c2..1f96891 100644
--- a/classes/cluster/virtual-mcp-pike-dvr/openstack/init.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr/openstack/init.yml
@@ -159,6 +159,7 @@
panko_public_host: ${_param:telemetry_public_host}
nova_version: ${_param:openstack_version}
nova_service_host: ${_param:cluster_vip_address}
+ placement_service_host: ${_param:cluster_vip_address}
nova_vncproxy_url: http://${_param:cluster_vip_address}:8060
neutron_version: ${_param:openstack_version}
neutron_service_host: ${_param:cluster_vip_address}
diff --git a/classes/cluster/virtual-mcp-pike-ovs/openstack/init.yml b/classes/cluster/virtual-mcp-pike-ovs/openstack/init.yml
index 63f26bb..56a55ac 100644
--- a/classes/cluster/virtual-mcp-pike-ovs/openstack/init.yml
+++ b/classes/cluster/virtual-mcp-pike-ovs/openstack/init.yml
@@ -138,6 +138,7 @@
panko_public_host: ${_param:telemetry_public_host}
nova_version: ${_param:openstack_version}
nova_service_host: ${_param:cluster_vip_address}
+ placement_service_host: ${_param:cluster_vip_address}
nova_vncproxy_url: http://${_param:cluster_vip_address}:8060
neutron_version: ${_param:openstack_version}
neutron_service_host: ${_param:cluster_vip_address}
diff --git a/classes/cluster/virtual-offline-pike-ovs-dpdk/openstack/init.yml b/classes/cluster/virtual-offline-pike-ovs-dpdk/openstack/init.yml
index a8d1314..363ccdb 100644
--- a/classes/cluster/virtual-offline-pike-ovs-dpdk/openstack/init.yml
+++ b/classes/cluster/virtual-offline-pike-ovs-dpdk/openstack/init.yml
@@ -157,6 +157,7 @@
panko_public_host: ${_param:telemetry_public_host}
nova_version: ${_param:openstack_version}
nova_service_host: ${_param:cluster_vip_address}
+ placement_service_host: ${_param:cluster_vip_address}
nova_vncproxy_url: http://${_param:cluster_vip_address}:8060
neutron_version: ${_param:openstack_version}
neutron_service_host: ${_param:cluster_vip_address}
diff --git a/classes/cluster/virtual-offline-pike-ovs/openstack/init.yml b/classes/cluster/virtual-offline-pike-ovs/openstack/init.yml
index e529290..d55f5d9 100644
--- a/classes/cluster/virtual-offline-pike-ovs/openstack/init.yml
+++ b/classes/cluster/virtual-offline-pike-ovs/openstack/init.yml
@@ -87,6 +87,7 @@
ceilometer_graphite_publisher_port: 2013
nova_version: ${_param:openstack_version}
nova_service_host: ${_param:cluster_vip_address}
+ placement_service_host: ${_param:cluster_vip_address}
nova_vncproxy_url: http://${_param:cluster_vip_address}:8060
neutron_version: ${_param:openstack_version}
neutron_service_host: ${_param:cluster_vip_address}
diff --git a/classes/cluster/virtual-offline-ssl/openstack/init.yml b/classes/cluster/virtual-offline-ssl/openstack/init.yml
index 13bbb5d..1c70831 100644
--- a/classes/cluster/virtual-offline-ssl/openstack/init.yml
+++ b/classes/cluster/virtual-offline-ssl/openstack/init.yml
@@ -172,6 +172,7 @@
panko_public_host: ${_param:telemetry_public_host}
nova_version: ${_param:openstack_version}
nova_service_host: ${_param:cluster_vip_address}
+ placement_service_host: ${_param:cluster_vip_address}
nova_vncproxy_url: http://${_param:cluster_vip_address}:8060
neutron_version: ${_param:openstack_version}
neutron_service_host: ${_param:cluster_vip_address}
diff --git a/classes/cluster/virtual-offline-ssl/openstack/proxy.yml b/classes/cluster/virtual-offline-ssl/openstack/proxy.yml
index 6bf692a..71126c4 100644
--- a/classes/cluster/virtual-offline-ssl/openstack/proxy.yml
+++ b/classes/cluster/virtual-offline-ssl/openstack/proxy.yml
@@ -14,6 +14,9 @@
enabled: true
authority: ${_param:salt_minion_ca_authority}
salt_minion_ca_host: cfg01.${linux:system:domain}
+ nginx_proxy_openstack_api_address: ${_param:cluster_local_address}
+ nginx_proxy_openstack_placement_host: 127.0.0.1
+ nginx_proxy_openstack_placement_protocol: ${_param:cluster_public_protocol}
nginx:
server:
site: