diff options
author | Jenkins <jenkins@review.openstack.org> | 2015-06-17 18:46:59 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2015-06-17 18:46:59 +0000 |
commit | d970f0a152a8136de678ecab5a6c7a9b2c1b8856 (patch) | |
tree | e9506f1d70a7931989b271b441a890b25597478c /puppet/controller-puppet.yaml | |
parent | 2e97ecdd6d77cd07d06d06d62db9edbf3bd19533 (diff) | |
parent | 1f37302f6b8ef7e6ce8dfe37eba528535493dbf9 (diff) |
Merge "Allow control of hostname formatting"
Diffstat (limited to 'puppet/controller-puppet.yaml')
-rw-r--r-- | puppet/controller-puppet.yaml | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/puppet/controller-puppet.yaml b/puppet/controller-puppet.yaml index a7648cd7..a6c77198 100644 --- a/puppet/controller-puppet.yaml +++ b/puppet/controller-puppet.yaml @@ -455,6 +455,9 @@ parameters: description: > Setting to a previously unused value during stack-update will trigger package update on all nodes + Hostname: + type: string + default: '' # Defaults to Heat created hostname resources: @@ -469,6 +472,7 @@ resources: - network: ctlplane user_data_format: SOFTWARE_CONFIG user_data: {get_resource: NodeUserData} + name: {get_param: Hostname} NodeUserData: type: OS::TripleO::NodeUserData |