diff options
author | Jenkins <jenkins@review.openstack.org> | 2016-03-02 07:15:22 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2016-03-02 07:15:22 +0000 |
commit | 0ed6bb6be8e733558a5338782d704f2b3a935971 (patch) | |
tree | 9b9a6c4c34657c0c1e59c28f93bb99cd38baf2ff /puppet/controller.yaml | |
parent | 0786c4bd53852809eacf12df3c25d6c3e1928933 (diff) | |
parent | 3c1850b780c3841ffcab1e35f81be623f0000e37 (diff) |
Merge "Add HostnameMap to allow granular control of hostnames"
Diffstat (limited to 'puppet/controller.yaml')
-rw-r--r-- | puppet/controller.yaml | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/puppet/controller.yaml b/puppet/controller.yaml index 6a31d5e5..37ded74d 100644 --- a/puppet/controller.yaml +++ b/puppet/controller.yaml @@ -700,6 +700,10 @@ parameters: Hostname: type: string default: '' # Defaults to Heat created hostname + HostnameMap: + type: json + default: {} + description: Optional mapping to override hostnames NetworkDeploymentActions: type: comma_delimited_list description: > @@ -745,7 +749,10 @@ resources: - network: ctlplane user_data_format: SOFTWARE_CONFIG user_data: {get_resource: UserData} - name: {get_param: Hostname} + name: + str_replace: + template: {get_param: Hostname} + params: {get_param: HostnameMap} software_config_transport: {get_param: SoftwareConfigTransport} metadata: {get_param: ServerMetadata} scheduler_hints: {get_param: SchedulerHints} |