diff options
author | 2016-07-07 09:40:19 +0000 | |
---|---|---|
committer | 2016-07-07 09:40:19 +0000 | |
commit | 294c81c0b1cd7fa2a28114f3450bc014b3127489 (patch) | |
tree | 2ee3a60599535e009712876209c66ed32d18879b | |
parent | e75563319fa2984256ff569a6eb2e4e980d80f4f (diff) | |
parent | 7ff66b9af1b755e3613e1f13274eef498eff1942 (diff) |
Merge "Remove config_identifier from all_nodes extraconfig examples"
-rw-r--r-- | extraconfig/all_nodes/default.yaml | 8 | ||||
-rw-r--r-- | extraconfig/all_nodes/mac_hostname.yaml | 7 | ||||
-rw-r--r-- | extraconfig/all_nodes/random_string.yaml | 6 | ||||
-rw-r--r-- | extraconfig/all_nodes/swap-partition.yaml | 4 | ||||
-rw-r--r-- | extraconfig/all_nodes/swap.yaml | 4 | ||||
-rw-r--r-- | puppet/extraconfig/all_nodes/neutron-midonet-all-nodes.yaml | 8 | ||||
-rw-r--r-- | puppet/extraconfig/all_nodes/neutron-ml2-cisco-nexus-ucsm.yaml | 8 |
7 files changed, 3 insertions, 42 deletions
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 diff --git a/puppet/extraconfig/all_nodes/neutron-midonet-all-nodes.yaml b/puppet/extraconfig/all_nodes/neutron-midonet-all-nodes.yaml index 3e455347..aa5c3c43 100644 --- a/puppet/extraconfig/all_nodes/neutron-midonet-all-nodes.yaml +++ b/puppet/extraconfig/all_nodes/neutron-midonet-all-nodes.yaml @@ -109,11 +109,3 @@ resources: properties: config: {get_resource: NetworkMidoNetConfig} servers: {get_param: compute_servers} - -outputs: - config_identifier: - value: - list_join: - - ' ' - - - {get_attr: [NetworkMidonetDeploymentControllers, deploy_stdouts]} - - {get_attr: [NetworkMidonetDeploymentComputes, deploy_stdouts]} diff --git a/puppet/extraconfig/all_nodes/neutron-ml2-cisco-nexus-ucsm.yaml b/puppet/extraconfig/all_nodes/neutron-ml2-cisco-nexus-ucsm.yaml index 71445800..e924fc87 100644 --- a/puppet/extraconfig/all_nodes/neutron-ml2-cisco-nexus-ucsm.yaml +++ b/puppet/extraconfig/all_nodes/neutron-ml2-cisco-nexus-ucsm.yaml @@ -343,11 +343,3 @@ resources: input_values: ucsm_config: {get_param: NetworkUCSMHostList} actions: ['CREATE'] # Only do this on CREATE - -outputs: - # The Deployment applying the hieradata outputs the derived config-id, which - # changes if the input_values change, so if the stdouts from - # NetworkCiscoDeployment change, we need to reapply puppet (which will - # happen if we return a different config_identifier) - config_identifier: - value: {get_attr: [NetworkCiscoDeployment, deploy_stdouts]} |