X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=puppet%2Fall-nodes-config.yaml;h=7602d8d0b54a4070f53326c4b12256695b3bab3d;hb=e8e7c42c0198f9796d3e88cd4ab518fdd61b2e1a;hp=97fbdebb207fc3eace1acc836ab790ef6d7a3240;hpb=700d65fe7625b191f405a595b108cdeae18abe86;p=apex-tripleo-heat-templates.git

diff --git a/puppet/all-nodes-config.yaml b/puppet/all-nodes-config.yaml
index 97fbdebb..7602d8d0 100644
--- a/puppet/all-nodes-config.yaml
+++ b/puppet/all-nodes-config.yaml
@@ -34,6 +34,8 @@ parameters:
     type: comma_delimited_list
   ceilometer_api_node_ips:
     type: comma_delimited_list
+  aodh_api_node_ips:
+    type: comma_delimited_list
   nova_api_node_ips:
     type: comma_delimited_list
   nova_metadata_node_ips:
@@ -42,6 +44,8 @@ parameters:
     type: comma_delimited_list
   glance_registry_node_ips:
     type: comma_delimited_list
+  gnocchi_api_node_ips:
+    type: comma_delimited_list
   cinder_api_node_ips:
     type: comma_delimited_list
   neutron_api_node_ips:
@@ -52,7 +56,12 @@ parameters:
     type: comma_delimited_list
   sahara_api_node_ips:
     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: >
@@ -63,6 +72,12 @@ parameters:
     description: >
       Setting to a previously unused value during stack-update will trigger
       package update on all nodes
+  StackAction:
+    type: string
+    description: >
+      Heat action on performed top-level stack.
+    constraints:
+    - allowed_values: ['CREATE', 'UPDATE']
 
 resources:
 
@@ -139,6 +154,14 @@ resources:
                         list_join:
                         - "','"
                         - {get_param: memcache_node_ips}
+                memcache_node_ips_v6:
+                  str_replace:
+                    template: "['inet6:[SERVERS_LIST]']"
+                    params:
+                      SERVERS_LIST:
+                        list_join:
+                        - "]','inet6:["
+                        - {get_param: memcache_node_ips}
                 mysql_node_ips:
                   str_replace:
                     template: "['SERVERS_LIST']"
@@ -179,6 +202,22 @@ resources:
                         list_join:
                         - "','"
                         - {get_param: ceilometer_api_node_ips}
+                aodh_api_node_ips:
+                  str_replace:
+                    template: "['SERVERS_LIST']"
+                    params:
+                      SERVERS_LIST:
+                        list_join:
+                        - "','"
+                        - {get_param: aodh_api_node_ips}
+                gnocchi_api_node_ips:
+                  str_replace:
+                    template: "['SERVERS_LIST']"
+                    params:
+                      SERVERS_LIST:
+                        list_join:
+                        - "','"
+                        - {get_param: gnocchi_api_node_ips}
                 nova_api_node_ips:
                   str_replace:
                     template: "['SERVERS_LIST']"
@@ -260,10 +299,35 @@ resources:
                         list_join:
                         - "','"
                         - {get_param: sahara_api_node_ips}
+                ironic_api_node_ips:
+                  str_replace:
+                    template: "['SERVERS_LIST']"
+                    params:
+                      SERVERS_LIST:
+                        list_join:
+                        - "','"
+                        - {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
+                aodh::rabbit_hosts: *rabbit_nodes_array
                 cinder::rabbit_hosts: *rabbit_nodes_array
                 glance::notify::rabbitmq::rabbit_hosts: *rabbit_nodes_array
                 heat::rabbit_hosts: *rabbit_nodes_array
@@ -271,9 +335,11 @@ resources:
                 nova::rabbit_hosts: *rabbit_nodes_array
                 keystone::rabbit_hosts: *rabbit_nodes_array
                 sahara::rabbit_hosts: *rabbit_nodes_array
+                ironic::rabbit_hosts: *rabbit_nodes_array
 
                 deploy_identifier: {get_param: DeployIdentifier}
                 update_identifier: {get_param: UpdateIdentifier}
+                stack_action: {get_param: StackAction}
 
 outputs:
   config_id: