Merge "Specify the Ceph packages to be installed"

[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 c0a3b59..cae60aa 100644 (file)
--- a/puppet/all-nodes-config.yaml
+++ b/puppet/all-nodes-config.yaml
@@ -2,6 +2,16 @@ heat_template_version: 2016-10-14
 description: 'All Nodes Config for Puppet'
 
 parameters:
+  cloud_name_external:
+    type: string
+  cloud_name_internal_api:
+    type: string
+  cloud_name_storage:
+    type: string
+  cloud_name_storage_mgmt:
+    type: string
+  cloud_name_ctlplane:
+    type: string
   hosts:
     type: comma_delimited_list
   # FIXME(shardy) this can be comma_delimited_list when
@@ -10,20 +20,25 @@ parameters:
     type: string
   controller_ips:
     type: comma_delimited_list
+  logging_groups:
+    type: json
+  logging_sources:
+    type: json
   service_ips:
     type: json
   service_node_names:
     type: json
+  short_service_node_names:
+    type: json
   controller_names:
     type: comma_delimited_list
   memcache_node_ips:
     type: comma_delimited_list
-  keystone_public_api_node_ips:
-    type: comma_delimited_list
-  keystone_admin_api_node_ips:
-    type: comma_delimited_list
   NetVipMap:
     type: json
+  RedisVirtualIP:
+    type: string
+    default: ''
   ServiceNetMap:
     type: json
   DeployIdentifier:
@@ -43,6 +58,12 @@ parameters:
       Heat action on performed top-level stack.
     constraints:
     - allowed_values: ['CREATE', 'UPDATE']
+  # NOTE(jaosorior): This is being set as IPA as it's the first
+  # CA we'll actually be testing out. But we can change this if
+  # people request it.
+  CertmongerCA:
+    type: string
+    default: 'IPA'
 
 resources:
 
@@ -64,6 +85,8 @@ resources:
             all_nodes:
               mapped_data:
                 map_merge:
+                  - tripleo::profile::base::logging::fluentd::fluentd_sources: {get_param: logging_sources}
+                  - tripleo::profile::base::logging::fluentd::fluentd_groups: {get_param: logging_groups}
                   - enabled_services: {get_param: enabled_services}
                   # This writes out a mapping of service_name_enabled: 'true'
                   # For any services not enabled, hiera foo_enabled will
@@ -107,6 +130,7 @@ resources:
                   # provides a mapping of service_name_ips to a list of IPs
                   - {get_param: service_ips}
                   - {get_param: service_node_names}
+                  - {get_param: short_service_node_names}
                   - controller_node_ips:
                       list_join:
                       - ','
@@ -123,22 +147,6 @@ resources:
                             list_join:
                             - "]','inet6:["
                             - {get_param: memcache_node_ips}
-                    keystone_public_api_node_ips:
-                      str_replace:
-                        template: "['SERVERS_LIST']"
-                        params:
-                          SERVERS_LIST:
-                            list_join:
-                            - "','"
-                            - {get_param: keystone_public_api_node_ips}
-                    keystone_admin_api_node_ips:
-                      str_replace:
-                        template: "['SERVERS_LIST']"
-                        params:
-                          SERVERS_LIST:
-                            list_join:
-                            - "','"
-                            - {get_param: keystone_admin_api_node_ips}
 
                     deploy_identifier: {get_param: DeployIdentifier}
                     update_identifier: {get_param: UpdateIdentifier}
@@ -180,6 +188,7 @@ resources:
                     internal_api_virtual_ip: {get_param: [NetVipMap, internal_api]}
                     storage_virtual_ip: {get_param: [NetVipMap, storage]}
                     storage_mgmt_virtual_ip: {get_param: [NetVipMap, storage_mgmt]}
+                    redis_vip: {get_param: RedisVirtualIP}
                     # public_virtual_ip and controller_virtual_ip are needed in
                     # both HAproxy & keepalived.
                     tripleo::haproxy::public_virtual_ip: {get_param: [NetVipMap, external]}
@@ -189,7 +198,15 @@ resources:
                     tripleo::keepalived::internal_api_virtual_ip: {get_param: [NetVipMap, internal_api]}
                     tripleo::keepalived::storage_virtual_ip: {get_param: [NetVipMap, storage]}
                     tripleo::keepalived::storage_mgmt_virtual_ip: {get_param: [NetVipMap, storage_mgmt]}
+                    tripleo::keepalived::redis_virtual_ip: {get_param: RedisVirtualIP}
                     tripleo::redis_notification::haproxy_monitor_ip: {get_param: [NetVipMap, ctlplane]}
+                    cloud_name_external: {get_param: cloud_name_external}
+                    cloud_name_internal_api: {get_param: cloud_name_internal_api}
+                    cloud_name_storage: {get_param: cloud_name_storage}
+                    cloud_name_storage_mgmt: {get_param: cloud_name_storage_mgmt}
+                    cloud_name_ctlplane: {get_param: cloud_name_ctlplane}
+                    # TLS parameters
+                    certmonger_ca: {get_param: CertmongerCA}
 
 outputs:
   config_id: