Implement mongo_node_ips hiera key

We need a list of hosts where MongoDB is supposed to run (as a list of
IP addresses, not names) to implement MongoDB support in overcloud.

Change-Id: I4b80f13be7e50630314d0642fa32b7763b6a2921

diff --git a/all-nodes-config.yaml b/all-nodes-config.yaml
index 677c12d..7fa27c5 100644 (file)
--- a/all-nodes-config.yaml
+++ b/all-nodes-config.yaml
@@ -6,6 +6,8 @@ parameters:
     type: comma_delimited_list
   controller_hosts:
     type: comma_delimited_list
+  controller_ips:
+    type: comma_delimited_list
   block_storage_hosts:
     type: comma_delimited_list
   object_storage_hosts:

diff --git a/overcloud-without-mergepy.yaml b/overcloud-without-mergepy.yaml
index 3bc969e..be32452 100644 (file)
--- a/overcloud-without-mergepy.yaml
+++ b/overcloud-without-mergepy.yaml
@@ -695,6 +695,7 @@ resources:
     properties:
       compute_hosts: {get_attr: [Compute, hosts_entry]}
       controller_hosts: {get_attr: [Controller, hosts_entry]}
+      controller_ips: {get_attr: [Controller, ip_address]}
       block_storage_hosts: {get_attr: [BlockStorage, hosts_entry]}
       object_storage_hosts: {get_attr: [ObjectStorage, hosts_entry]}
       ceph_storage_hosts: {get_attr: [CephStorage, hosts_entry]}

diff --git a/puppet/all-nodes-config.yaml b/puppet/all-nodes-config.yaml
index 7fca449..55acb4b 100644 (file)
--- a/puppet/all-nodes-config.yaml
+++ b/puppet/all-nodes-config.yaml
@@ -6,6 +6,8 @@ parameters:
     type: comma_delimited_list
   controller_hosts:
     type: comma_delimited_list
+  controller_ips:
+    type: comma_delimited_list
   block_storage_hosts:
     type: comma_delimited_list
   object_storage_hosts:
@@ -52,6 +54,10 @@ resources:
                   list_join:
                   - ','
                   - {get_param: controller_names}
+                mongo_node_ips:
+                  list_join:
+                  - ','
+                  - {get_param: controller_ips}
 
 outputs:
   config_id: