Merge "Add sriov_numvfs in THT"

[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 7602d8d..f1ce42b 100644 (file)
--- a/puppet/all-nodes-config.yaml
+++ b/puppet/all-nodes-config.yaml
@@ -2,18 +2,10 @@ heat_template_version: 2015-04-30
 description: 'All Nodes Config for Puppet'
 
 parameters:
-  compute_hosts:
-    type: comma_delimited_list
-  controller_hosts:
+  hosts:
     type: comma_delimited_list
   controller_ips:
     type: comma_delimited_list
-  block_storage_hosts:
-    type: comma_delimited_list
-  object_storage_hosts:
-    type: comma_delimited_list
-  ceph_storage_hosts:
-    type: comma_delimited_list
   controller_names:
     type: comma_delimited_list
   rabbit_node_ips:
@@ -48,6 +40,8 @@ parameters:
     type: comma_delimited_list
   cinder_api_node_ips:
     type: comma_delimited_list
+  manila_api_node_ips:
+    type: comma_delimited_list
   neutron_api_node_ips:
     type: comma_delimited_list
   keystone_public_api_node_ips:
@@ -89,25 +83,13 @@ resources:
         hosts:
           list_join:
           - "\n"
-          - - list_join:
-              - "\n"
-              - {get_param: compute_hosts}
-            - list_join:
-              - "\n"
-              - {get_param: controller_hosts}
-            - list_join:
-              - "\n"
-              - {get_param: block_storage_hosts}
-            - list_join:
-              - "\n"
-              - {get_param: object_storage_hosts}
-            - list_join:
-              - "\n"
-              - {get_param: ceph_storage_hosts}
+          - {get_param: hosts}
         hiera:
           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:
@@ -122,7 +104,7 @@ resources:
                   list_join:
                   - ','
                   - {get_param: controller_names}
-                rabbit_node_ips: &rabbit_nodes_array
+                rabbitmq_node_ips: &rabbit_nodes_array
                   str_replace:
                     template: "['SERVERS_LIST']"
                     params:
@@ -130,7 +112,7 @@ resources:
                         list_join:
                         - "','"
                         - {get_param: rabbit_node_ips}
-                mongo_node_ips:
+                mongodb_node_ips:
                   str_replace:
                     template: "['SERVERS_LIST']"
                     params:
@@ -146,7 +128,7 @@ resources:
                         list_join:
                         - "','"
                         - {get_param: redis_node_ips}
-                memcache_node_ips:
+                memcached_node_ips:
                   str_replace:
                     template: "['SERVERS_LIST']"
                     params:
@@ -154,7 +136,7 @@ resources:
                         list_join:
                         - "','"
                         - {get_param: memcache_node_ips}
-                memcache_node_ips_v6:
+                memcached_node_ips_v6:
                   str_replace:
                     template: "['inet6:[SERVERS_LIST]']"
                     params:
@@ -258,6 +240,14 @@ resources:
                         list_join:
                         - "','"
                         - {get_param: cinder_api_node_ips}
+                manila_api_node_ips:
+                  str_replace:
+                    template: "['SERVERS_LIST']"
+                    params:
+                      SERVERS_LIST:
+                        list_join:
+                        - "','"
+                        - {get_param: manila_api_node_ips}
                 neutron_api_node_ips:
                   str_replace:
                     template: "['SERVERS_LIST']"
@@ -330,6 +320,7 @@ resources:
                 aodh::rabbit_hosts: *rabbit_nodes_array
                 cinder::rabbit_hosts: *rabbit_nodes_array
                 glance::notify::rabbitmq::rabbit_hosts: *rabbit_nodes_array
+                manila::rabbit_hosts: *rabbit_nodes_array
                 heat::rabbit_hosts: *rabbit_nodes_array
                 neutron::rabbit_hosts: *rabbit_nodes_array
                 nova::rabbit_hosts: *rabbit_nodes_array