diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-07-12 15:19:18 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-07-12 15:19:19 +0000 |
| commit | a31fc6c250683d5463dc9cba4db4f5e09f45dbb4 (patch) | |
| tree | 680c02a86992580c06a5dd0e3861b32c50e6388d /overcloud-resource-registry-puppet.yaml | |
| parent | bff2b3f4e5fd21a2746914e8b3cee67282bb7d82 (diff) | |
| parent | c3d595c49a6c507f16fd2c06cdecb9253dd326f6 (diff) | |
Merge "Use already Deployed/Installed servers"
Diffstat (limited to 'overcloud-resource-registry-puppet.yaml')
| -rw-r--r-- | overcloud-resource-registry-puppet.yaml | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/overcloud-resource-registry-puppet.yaml b/overcloud-resource-registry-puppet.yaml index 379daab8..6bd3ec00 100644 --- a/overcloud-resource-registry-puppet.yaml +++ b/overcloud-resource-registry-puppet.yaml @@ -28,6 +28,9 @@ resource_registry: OS::TripleO::Tasks::ControllerPrePuppet: OS::Heat::None OS::TripleO::Tasks::ControllerPostPuppet: OS::Heat::None + + OS::TripleO::Server: OS::Nova::Server + # This creates the "heat-admin" user for all OS images by default # To disable, replace with firstboot/userdata_default.yaml OS::TripleO::NodeAdminUserData: firstboot/userdata_heat_admin.yaml |