Support for Ocata-Pike live-migration over ssh

[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 b29a8a9..37c1d4e 100644 (file)
--- a/puppet/all-nodes-config.yaml
+++ b/puppet/all-nodes-config.yaml
@@ -16,10 +16,6 @@ parameters:
     type: comma_delimited_list
   controller_ips:
     type: comma_delimited_list
-  logging_groups:
-    type: json
-  logging_sources:
-    type: json
   service_ips:
     type: json
   service_node_names:
@@ -45,6 +41,7 @@ parameters:
       perform configuration on a Heat stack-update.
   UpdateIdentifier:
     type: string
+    default: ''
     description: >
       Setting to a previously unused value during stack-update will trigger
       package update on all nodes
@@ -75,7 +72,7 @@ parameters:
 
   InternalApiNetName:
     default: internal_api
-    description: The name of the internal API network.
+    description: The name of the internal_api network.
     type: string
   ExternalNetName:
     default: external
@@ -91,7 +88,7 @@ parameters:
     type: string
   StorageMgmtNetName:
     default: storage_mgmt
-    description: The name of the Storage management network.
+    description: The name of the storage_mgmt network.
     type: string
   TenantNetName:
     default: tenant
@@ -112,8 +109,6 @@ resources:
             bootstrap_nodeid_ip: {get_input: bootstrap_nodeid_ip}
           all_nodes:
            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:
                   yaql:
                     expression: $.data.distinct()