X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=puppet%2Fall-nodes-config.yaml;h=a53d898175f5b8d6c4b742920db3c9a3e316d8c1;hb=f733b2edd1721fb187d3f261e2d8d8ab3f40c9f1;hp=9dd43680e6ee6db5ee2988c96963f69611d9f14a;hpb=5e30128459191e1122a73cc4971472fd818b5e38;p=apex-tripleo-heat-templates.git

diff --git a/puppet/all-nodes-config.yaml b/puppet/all-nodes-config.yaml
index 9dd43680..a53d8981 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:
@@ -50,6 +54,10 @@ parameters:
     type: comma_delimited_list
   keystone_admin_api_node_ips:
     type: comma_delimited_list
+  sahara_api_node_ips:
+    type: comma_delimited_list
+  ironic_api_node_ips:
+    type: comma_delimited_list
 
   DeployIdentifier:
     type: string
@@ -61,14 +69,20 @@ 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:
 
   allNodesConfigImpl:
     type: OS::Heat::StructuredConfig
     properties:
+      group: os-apply-config
       config:
-        completion-signal: {get_input: deploy_signal_id}
         hosts:
           list_join:
           - "\n"
@@ -137,6 +151,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']"
@@ -177,6 +199,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']"
@@ -225,6 +263,15 @@ resources:
                         list_join:
                         - "','"
                         - {get_param: neutron_api_node_ips}
+                # TODO: pass a `midonet_api_node_ips` var
+                midonet_api_node_ips:
+                  str_replace:
+                    template: "['SERVERS_LIST']"
+                    params:
+                      SERVERS_LIST:
+                        list_join:
+                        - "','"
+                        - {get_param: neutron_api_node_ips}
                 keystone_public_api_node_ips:
                   str_replace:
                     template: "['SERVERS_LIST']"
@@ -241,18 +288,39 @@ resources:
                         list_join:
                         - "','"
                         - {get_param: keystone_admin_api_node_ips}
+                sahara_api_node_ips:
+                  str_replace:
+                    template: "['SERVERS_LIST']"
+                    params:
+                      SERVERS_LIST:
+                        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}
 
                 # 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
                 neutron::rabbit_hosts: *rabbit_nodes_array
                 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: