diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2015-09-08 13:03:38 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2015-09-08 13:03:38 +0000 |
| commit | 9a8e384a145b48ef9d7f58da13bc828bbc79941d (patch) | |
| tree | a9e4985a90f389cb58b4873b3a436a0d71f0159d /overcloud-resource-registry-puppet.yaml | |
| parent | 63fde6c98b4b46ddb9168e2ee3d571390f6979ad (diff) | |
| parent | d578cf1ac057643428eba77c3c0a0d31b9db6ad3 (diff) | |
Merge "Add NodeAdminUserData interface for "heat-admin" user"
Diffstat (limited to 'overcloud-resource-registry-puppet.yaml')
| -rw-r--r-- | overcloud-resource-registry-puppet.yaml | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/overcloud-resource-registry-puppet.yaml b/overcloud-resource-registry-puppet.yaml index ba1b6f73..ecb1162e 100644 --- a/overcloud-resource-registry-puppet.yaml +++ b/overcloud-resource-registry-puppet.yaml @@ -23,6 +23,10 @@ resource_registry: OS::TripleO::BootstrapNode::SoftwareConfig: puppet/bootstrap-config.yaml OS::TripleO::Tasks::PackageUpdate: extraconfig/tasks/yum_update.yaml + # 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 + # Hooks for operator extra config # NodeUserData == Cloud-init additional user-data, e.g cloud-config # ControllerExtraConfigPre == Controller configuration pre service deployment |