openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Replace extraconfig/tasks/noop.yaml w/ Heat::None"

This commit is contained in:
Jenkins 2016-04-11 01:14:08 +00:00 committed by Gerrit Code Review
parent 8d663e09fa ec78afd2cb
commit 49bae7f298
2 changed files with 3 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
extraconfig/tasks/noop.yaml
View File

@ -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

6
overcloud-resource-registry-puppet.yaml
View File

@ -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