Merge "Adds OpenDaylight composable service"

[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 db8bb45..ddde549 100644 (file)
--- a/puppet/all-nodes-config.yaml
+++ b/puppet/all-nodes-config.yaml
@@ -40,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:
@@ -54,6 +56,8 @@ parameters:
     type: comma_delimited_list
   ceph_mon_node_names:
     type: comma_delimited_list
+  opendaylight_api_node_ips:
+    type: comma_delimited_list
   DeployIdentifier:
     type: string
     description: >
@@ -102,7 +106,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:
@@ -110,7 +114,7 @@ resources:
                         list_join:
                         - "','"
                         - {get_param: rabbit_node_ips}
-                mongo_node_ips:
+                mongodb_node_ips:
                   str_replace:
                     template: "['SERVERS_LIST']"
                     params:
@@ -126,7 +130,7 @@ resources:
                         list_join:
                         - "','"
                         - {get_param: redis_node_ips}
-                memcache_node_ips:
+                memcached_node_ips:
                   str_replace:
                     template: "['SERVERS_LIST']"
                     params:
@@ -134,7 +138,7 @@ resources:
                         list_join:
                         - "','"
                         - {get_param: memcache_node_ips}
-                memcache_node_ips_v6:
+                memcached_node_ips_v6:
                   str_replace:
                     template: "['inet6:[SERVERS_LIST]']"
                     params:
@@ -238,6 +242,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']"
@@ -287,7 +299,14 @@ resources:
                         list_join:
                         - "','"
                         - {get_param: ironic_api_node_ips}
-
+                opendaylight_api_node_ips:
+                  str_replace:
+                    template: "['SERVERS_LIST']"
+                    params:
+                      SERVERS_LIST:
+                        list_join:
+                        - "','"
+                        - {get_param: opendaylight_api_node_ips}
                 tripleo::profile::base::ceph::ceph_mon_initial_members:
                   list_join:
                   - ','
@@ -310,6 +329,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