Merge "Gnocchi composable roles"

[apex-tripleo-heat-templates.git] / puppet / all-nodes-config.yaml

diff --git a/puppet/all-nodes-config.yaml b/puppet/all-nodes-config.yaml
index a53d898..5512091 100644 (file)
--- a/puppet/all-nodes-config.yaml
+++ b/puppet/all-nodes-config.yaml
@@ -58,7 +58,10 @@ parameters:
     type: comma_delimited_list
   ironic_api_node_ips:
     type: comma_delimited_list
-
+  ceph_mon_node_ips:
+    type: comma_delimited_list
+  ceph_mon_node_names:
+    type: comma_delimited_list
   DeployIdentifier:
     type: string
     description: >
@@ -105,6 +108,10 @@ resources:
           datafiles:
             RedHat:
               raw_data: {get_file: hieradata/RedHat.yaml}
+            bootstrap_node:
+              mapped_data:
+                bootstrap_nodeid: {get_input: bootstrap_nodeid}
+                bootstrap_nodeid_ip: {get_input: bootstrap_nodeid_ip}
             all_nodes:
               mapped_data:
                 controller_node_ips:
@@ -305,6 +312,22 @@ resources:
                         - "','"
                         - {get_param: ironic_api_node_ips}
 
+                tripleo::profile::base::ceph::ceph_mon_initial_members:
+                  list_join:
+                  - ','
+                  - {get_param: ceph_mon_node_names}
+                tripleo::profile::base::ceph::ceph_mon_host:
+                  list_join:
+                  - ','
+                  - {get_param: ceph_mon_node_ips}
+                tripleo::profile::base::ceph::ceph_mon_host_v6:
+                  str_replace:
+                    template: "'[IPS_LIST]'"
+                    params:
+                      IPS_LIST:
+                        list_join:
+                        - '],['
+                        - {get_param: ceph_mon_node_ips}
                 # NOTE(gfidente): interpolation with %{} in the
                 # hieradata file can't be used as it returns string
                 ceilometer::rabbit_hosts: *rabbit_nodes_array