Merge "Fix pillar data for compute in k8s contrail"
diff --git a/classes/cluster/os_ha_ovs/infra/config.yml b/classes/cluster/os_ha_ovs/infra/config.yml
index 01e6bc2..0b119ef 100644
--- a/classes/cluster/os_ha_ovs/infra/config.yml
+++ b/classes/cluster/os_ha_ovs/infra/config.yml
@@ -91,6 +91,11 @@
node_class:
value_template:
- cluster.<<node_cluster>>.openstack.compute
+ node_param:
+ tenant_address:
+ value_template: <<node_tenant_ip>>
+ external_address:
+ value_template: <<node_external_ip>>
node:
openstack_control_node01:
classes:
diff --git a/classes/cluster/sl_os_ovs/infra/config.yml b/classes/cluster/sl_os_ovs/infra/config.yml
index 0f4bd7a..dfe2a2e 100644
--- a/classes/cluster/sl_os_ovs/infra/config.yml
+++ b/classes/cluster/sl_os_ovs/infra/config.yml
@@ -93,6 +93,11 @@
node_class:
value_template:
- cluster.<<node_cluster>>.openstack.compute
+ node_param:
+ tenant_address:
+ value_template: <<node_tenant_ip>>
+ external_address:
+ value_template: <<node_external_ip>>
stacklight_monitor01:
expression: <<node_hostname>>__equals__mon01
cluster_param:
diff --git a/classes/cluster/virtual-mcp11-contrail-nfv/openstack/control.yml b/classes/cluster/virtual-mcp11-contrail-nfv/openstack/control.yml
index 27e6fe9..abc4a46 100755
--- a/classes/cluster/virtual-mcp11-contrail-nfv/openstack/control.yml
+++ b/classes/cluster/virtual-mcp11-contrail-nfv/openstack/control.yml
@@ -19,6 +19,7 @@
- system.glusterfs.client.volume.keystone
- system.glance.control.cluster
- system.nova.control.cluster
+- system.haproxy.proxy.listen.openstack.nova-placement
- system.neutron.control.opencontrail.cluster
- system.cinder.control.cluster
- system.heat.server.cluster
diff --git a/classes/cluster/virtual-mcp11-contrail/openstack/control.yml b/classes/cluster/virtual-mcp11-contrail/openstack/control.yml
index 5c0b690..03f23ef 100755
--- a/classes/cluster/virtual-mcp11-contrail/openstack/control.yml
+++ b/classes/cluster/virtual-mcp11-contrail/openstack/control.yml
@@ -19,6 +19,7 @@
- system.glusterfs.client.volume.keystone
- system.glance.control.cluster
- system.nova.control.cluster
+- system.haproxy.proxy.listen.openstack.nova-placement
- system.neutron.control.opencontrail.cluster
- system.cinder.control.cluster
- system.heat.server.cluster