diff options
author | 2015-06-17 18:46:59 +0000 | |
---|---|---|
committer | 2015-06-17 18:46:59 +0000 | |
commit | d970f0a152a8136de678ecab5a6c7a9b2c1b8856 (patch) | |
tree | e9506f1d70a7931989b271b441a890b25597478c /puppet | |
parent | 2e97ecdd6d77cd07d06d06d62db9edbf3bd19533 (diff) | |
parent | 1f37302f6b8ef7e6ce8dfe37eba528535493dbf9 (diff) |
Merge "Allow control of hostname formatting"
Diffstat (limited to 'puppet')
-rw-r--r-- | puppet/ceph-storage-puppet.yaml | 4 | ||||
-rw-r--r-- | puppet/cinder-storage-puppet.yaml | 4 | ||||
-rw-r--r-- | puppet/compute-puppet.yaml | 4 | ||||
-rw-r--r-- | puppet/controller-puppet.yaml | 4 | ||||
-rw-r--r-- | puppet/swift-storage-puppet.yaml | 4 |
5 files changed, 20 insertions, 0 deletions
diff --git a/puppet/ceph-storage-puppet.yaml b/puppet/ceph-storage-puppet.yaml index 4bba126b..615533ee 100644 --- a/puppet/ceph-storage-puppet.yaml +++ b/puppet/ceph-storage-puppet.yaml @@ -39,6 +39,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: CephStorage: @@ -52,6 +55,7 @@ resources: - network: ctlplane user_data_format: SOFTWARE_CONFIG user_data: {get_resource: NodeUserData} + name: {get_param: Hostname} NodeUserData: type: OS::TripleO::NodeUserData diff --git a/puppet/cinder-storage-puppet.yaml b/puppet/cinder-storage-puppet.yaml index 8fecb638..862625e0 100644 --- a/puppet/cinder-storage-puppet.yaml +++ b/puppet/cinder-storage-puppet.yaml @@ -117,6 +117,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: BlockStorage: @@ -130,6 +133,7 @@ resources: - network: ctlplane user_data_format: SOFTWARE_CONFIG user_data: {get_resource: NodeUserData} + name: {get_param: Hostname} NodeUserData: type: OS::TripleO::NodeUserData diff --git a/puppet/compute-puppet.yaml b/puppet/compute-puppet.yaml index ebb47aeb..96b0084a 100644 --- a/puppet/compute-puppet.yaml +++ b/puppet/compute-puppet.yaml @@ -258,6 +258,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: @@ -274,6 +277,7 @@ resources: - network: ctlplane user_data_format: SOFTWARE_CONFIG user_data: {get_resource: NodeUserData} + name: {get_param: Hostname} NodeUserData: type: OS::TripleO::NodeUserData 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 diff --git a/puppet/swift-storage-puppet.yaml b/puppet/swift-storage-puppet.yaml index 73051a7d..1a645956 100644 --- a/puppet/swift-storage-puppet.yaml +++ b/puppet/swift-storage-puppet.yaml @@ -62,6 +62,9 @@ parameters: description: Mapping of service_name -> network name. Typically set via parameter_defaults in the resource registry. type: json + Hostname: + type: string + default: '' # Defaults to Heat created hostname resources: @@ -75,6 +78,7 @@ resources: - network: ctlplane user_data_format: SOFTWARE_CONFIG user_data: {get_resource: NodeUserData} + name: {get_param: Hostname} NodeUserData: type: OS::TripleO::NodeUserData |