From 7ff66b9af1b755e3613e1f13274eef498eff1942 Mon Sep 17 00:00:00 2001 From: Steven Hardy Date: Tue, 5 Jul 2016 17:46:23 +0100 Subject: Remove config_identifier from all_nodes extraconfig examples Since https://review.openstack.org/#/c/315616 this is no longer required. Change-Id: I0452d1577a25d19b4351bfe7830a6c7bbe485e67 --- extraconfig/all_nodes/default.yaml | 8 +++----- extraconfig/all_nodes/mac_hostname.yaml | 7 ------- extraconfig/all_nodes/random_string.yaml | 6 ------ extraconfig/all_nodes/swap-partition.yaml | 4 ---- extraconfig/all_nodes/swap.yaml | 4 ---- 5 files changed, 3 insertions(+), 26 deletions(-) (limited to 'extraconfig') diff --git a/extraconfig/all_nodes/default.yaml b/extraconfig/all_nodes/default.yaml index 68f9eadd..b210588f 100644 --- a/extraconfig/all_nodes/default.yaml +++ b/extraconfig/all_nodes/default.yaml @@ -20,8 +20,6 @@ parameters: # Note extra parameters can be defined, then passed data via the # environment parameter_defaults, without modifying the parent template -outputs: - # This value should change if the configuration data has changed - # It is used to e.g re-apply puppet after hieradata values change. - config_identifier: - value: none +#outputs: + # Outputs can be passed here and inspected via heat, but they are not + # consumed by the parent template diff --git a/extraconfig/all_nodes/mac_hostname.yaml b/extraconfig/all_nodes/mac_hostname.yaml index 5883e06a..7d8704e3 100644 --- a/extraconfig/all_nodes/mac_hostname.yaml +++ b/extraconfig/all_nodes/mac_hostname.yaml @@ -113,10 +113,3 @@ resources: objectstorage_mappings: {get_attr: [CollectMacDeploymentsObjectStorage, deploy_stdouts]} cephstorage_mappings: {get_attr: [CollectMacDeploymentsCephStorage, deploy_stdouts]} actions: ['CREATE'] # Only do this on CREATE - -outputs: - # This value should change if the configuration data has changed - # It is used to e.g re-apply puppet after hieradata values change. - config_identifier: - value: {get_attr: [DistributeMacDeploymentsController, deploy_stdouts]} - diff --git a/extraconfig/all_nodes/random_string.yaml b/extraconfig/all_nodes/random_string.yaml index 49d2d8b6..d38701e2 100644 --- a/extraconfig/all_nodes/random_string.yaml +++ b/extraconfig/all_nodes/random_string.yaml @@ -57,9 +57,3 @@ resources: actions: ['CREATE'] # Only do this on CREATE input_values: random_value: {get_attr: [Random, value]} - -outputs: - # This value should change if the configuration data has changed - # It is used to e.g re-apply puppet after hieradata values change. - config_identifier: - value: {get_attr: [Random, value]} diff --git a/extraconfig/all_nodes/swap-partition.yaml b/extraconfig/all_nodes/swap-partition.yaml index 89a2adb0..e6fa9eca 100644 --- a/extraconfig/all_nodes/swap-partition.yaml +++ b/extraconfig/all_nodes/swap-partition.yaml @@ -84,7 +84,3 @@ resources: input_values: swap_partition_label: {get_param: swap_partition_label} actions: ["CREATE"] - -outputs: - config_identifier: - value: none diff --git a/extraconfig/all_nodes/swap.yaml b/extraconfig/all_nodes/swap.yaml index 374b1e5d..5383ffc9 100644 --- a/extraconfig/all_nodes/swap.yaml +++ b/extraconfig/all_nodes/swap.yaml @@ -102,7 +102,3 @@ resources: swap_size_megabytes: {get_param: swap_size_megabytes} swap_path: {get_param: swap_path} actions: ["CREATE"] - -outputs: - config_identifier: - value: none -- cgit 1.2.3-korg