Remove config_identifier from all_nodes extraconfig examples

Since https://review.openstack.org/#/c/315616 this is no longer
required.

Change-Id: I0452d1577a25d19b4351bfe7830a6c7bbe485e67

diff --git a/extraconfig/all_nodes/default.yaml b/extraconfig/all_nodes/default.yaml
index 68f9ead..b210588 100644 (file)
--- 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 5883e06..7d8704e 100644 (file)
--- 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 49d2d8b..d38701e 100644 (file)
--- 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 89a2adb..e6fa9ec 100644 (file)
--- 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 374b1e5..5383ffc 100644 (file)
--- 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 3e45534..aa5c3c4 100644 (file)
--- 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 7144580..e924fc8 100644 (file)
--- 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]}