diff options
| author |   Steven Hardy <shardy@redhat.com> | 2015-09-03 10:38:59 +0100 |
|---|---|---|
| committer | Steven Hardy <shardy@redhat.com> | 2015-09-03 13:56:16 +0100 |
| commit | d578cf1ac057643428eba77c3c0a0d31b9db6ad3 (patch) | |
| tree | f26cc28806626c8df99b07b589fdafc15695321f /overcloud-resource-registry-puppet.yaml | |
| parent | e83af2b8c00d8ae21067b5001e70c030116b0dfe (diff) | |
Add NodeAdminUserData interface for "heat-admin" user
Reinstates the heat-admin user via template user-data, which
replaces the previous boothook injected user provided by the
(deprecated now removed) heat instance_user option.
This has some advantages over the heat.conf option, e.g it allows
for much easier customzation of the user configuration (additional
SSH keys, adding groups etc), and also in future if we support
deploying more than one overcloud you could specify a different
user per deployment.
Co-Authored-By: Dan Prince <dprince@redhat.com>
Change-Id: I2235b9690c01542d8a28ec1c1a4607de751aea29
Closes-Bug: #1229849
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 523e4477..39d752f5 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 |