Code Review
/
apex-tripleo-heat-templates.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Run sync in step 3 when $sync_db
[apex-tripleo-heat-templates.git]
/
overcloud-resource-registry-puppet.yaml
diff --git
a/overcloud-resource-registry-puppet.yaml
b/overcloud-resource-registry-puppet.yaml
index
cba0291
..
4f79e51
100644
(file)
--- 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::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::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
# This creates the "heat-admin" user for all OS images by default
# To disable, replace with firstboot/userdata_default.yaml
@@
-123,6
+123,9
@@
resource_registry:
# services
OS::TripleO::Services: puppet/services/services.yaml
# services
OS::TripleO::Services: puppet/services/services.yaml
+ OS::TripleO::Services::Keystone: puppet/services/keystone.yaml
+ OS::TripleO::Services::GlanceApi: puppet/services/glance-api.yaml
+ OS::TripleO::Services::GlanceRegistry: puppet/services/glance-registry.yaml
parameter_defaults:
EnablePackageInstall: false
parameter_defaults:
EnablePackageInstall: false