diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-04-11 01:14:08 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-04-11 01:14:09 +0000 |
| commit | 49bae7f298c636887797d5c586328afb4241d8ff (patch) | |
| tree | 241ccc060668239ef1654f6053ff2fd5f9ca67df /overcloud-resource-registry-puppet.yaml | |
| parent | 8d663e09fabc357d35b16b945c5eaced1f05c2a8 (diff) | |
| parent | ec78afd2cb6a0fe6e800cc2da756593dfca817e9 (diff) | |
Merge "Replace extraconfig/tasks/noop.yaml w/ Heat::None"
Diffstat (limited to 'overcloud-resource-registry-puppet.yaml')
| -rw-r--r-- | overcloud-resource-registry-puppet.yaml | 6 |
1 files changed, 3 insertions, 3 deletions
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 |