summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-04-11 01:14:08 +0000
committerGerrit Code Review <review@openstack.org>2016-04-11 01:14:09 +0000
commit49bae7f298c636887797d5c586328afb4241d8ff (patch)
tree241ccc060668239ef1654f6053ff2fd5f9ca67df
parent8d663e09fabc357d35b16b945c5eaced1f05c2a8 (diff)
parentec78afd2cb6a0fe6e800cc2da756593dfca817e9 (diff)
Merge "Replace extraconfig/tasks/noop.yaml w/ Heat::None"
-rw-r--r--extraconfig/tasks/noop.yaml26
-rw-r--r--overcloud-resource-registry-puppet.yaml6
2 files changed, 3 insertions, 29 deletions
diff --git a/extraconfig/tasks/noop.yaml b/extraconfig/tasks/noop.yaml
deleted file mode 100644
index dbb863be..00000000
--- a/extraconfig/tasks/noop.yaml
+++ /dev/null
@@ -1,26 +0,0 @@
-heat_template_version: 2014-10-16
-description: 'No-op task'
-
-parameters:
- servers:
- type: json
- default: []
- controller_servers:
- type: json
- default: []
- compute_servers:
- type: json
- default: []
- blockstorage_servers:
- type: json
- default: []
- objectstorage_servers:
- type: json
- default: []
- cephstorage_servers:
- type: json
- default: []
- input_values:
- type: json
- default: {}
- description: input values for the software deployments
diff --git a/overcloud-resource-registry-puppet.yaml b/overcloud-resource-registry-puppet.yaml
index cba02916..0dad1153 100644
--- a/overcloud-resource-registry-puppet.yaml
+++ b/overcloud-resource-registry-puppet.yaml
@@ -23,10 +23,10 @@ resource_registry:
OS::TripleO::BootstrapNode::SoftwareConfig: puppet/bootstrap-config.yaml
# Tasks (for internal TripleO usage)
- OS::TripleO::Tasks::UpdateWorkflow: extraconfig/tasks/noop.yaml
+ OS::TripleO::Tasks::UpdateWorkflow: OS::Heat::None
OS::TripleO::Tasks::PackageUpdate: extraconfig/tasks/yum_update.yaml
- OS::TripleO::Tasks::ControllerPrePuppet: extraconfig/tasks/noop.yaml
- OS::TripleO::Tasks::ControllerPostPuppet: extraconfig/tasks/noop.yaml
+ OS::TripleO::Tasks::ControllerPrePuppet: OS::Heat::None
+ OS::TripleO::Tasks::ControllerPostPuppet: OS::Heat::None
# This creates the "heat-admin" user for all OS images by default
# To disable, replace with firstboot/userdata_default.yaml