diff options
Diffstat (limited to 'puppet')
| -rw-r--r-- | puppet/all-nodes-config.yaml | 3 | ||||
| -rw-r--r-- | puppet/blockstorage-config.yaml | 44 | ||||
| -rw-r--r-- | puppet/blockstorage-role.yaml (renamed from puppet/blockstorage.yaml) | 45 | ||||
| -rw-r--r-- | puppet/cephstorage-config.yaml | 44 | ||||
| -rw-r--r-- | puppet/cephstorage-role.yaml (renamed from puppet/cephstorage.yaml) | 45 | ||||
| -rw-r--r-- | puppet/compute-role.yaml (renamed from puppet/compute.yaml) | 45 | ||||
| -rw-r--r-- | puppet/config.role.j2.yaml (renamed from puppet/compute-config.yaml) | 14 | ||||
| -rw-r--r-- | puppet/controller-config.yaml | 44 | ||||
| -rw-r--r-- | puppet/controller-role.yaml (renamed from puppet/controller.yaml) | 45 | ||||
| -rw-r--r-- | puppet/objectstorage-config.yaml | 44 | ||||
| -rw-r--r-- | puppet/objectstorage-role.yaml (renamed from puppet/objectstorage.yaml) | 45 |
11 files changed, 235 insertions, 183 deletions
diff --git a/puppet/all-nodes-config.yaml b/puppet/all-nodes-config.yaml index 67dc056b..cddd99d5 100644 --- a/puppet/all-nodes-config.yaml +++ b/puppet/all-nodes-config.yaml @@ -24,6 +24,8 @@ parameters: type: json service_node_names: type: json + short_service_node_names: + type: json controller_names: type: comma_delimited_list memcache_node_ips: @@ -122,6 +124,7 @@ resources: # provides a mapping of service_name_ips to a list of IPs - {get_param: service_ips} - {get_param: service_node_names} + - {get_param: short_service_node_names} - controller_node_ips: list_join: - ',' diff --git a/puppet/blockstorage-config.yaml b/puppet/blockstorage-config.yaml deleted file mode 100644 index 0a052315..00000000 --- a/puppet/blockstorage-config.yaml +++ /dev/null @@ -1,44 +0,0 @@ -heat_template_version: 2015-04-30 - -description: > - A software config which applies puppet on the blockstorage role - -parameters: - ConfigDebug: - default: false - description: Whether to run config management (e.g. Puppet) in debug mode. - type: boolean - StepConfig: - type: string - description: Config manifests that will be used to step through the deployment. - default: '' - -resources: - - BlockStoragePuppetConfigImpl: - type: OS::Heat::SoftwareConfig - properties: - group: puppet - options: - enable_debug: {get_param: ConfigDebug} - enable_hiera: True - enable_facter: False - modulepath: /etc/puppet/modules:/opt/stack/puppet-modules:/usr/share/openstack-puppet/modules - inputs: - - name: step - type: Number - outputs: - - name: result - config: - list_join: - - '' - - - str_replace: - template: {get_file: manifests/overcloud_role.pp} - params: - __ROLE__: blockstorage - - {get_param: StepConfig} - -outputs: - OS::stack_id: - description: The software config which applies puppet on the blockstorage role - value: {get_resource: BlockStoragePuppetConfigImpl} diff --git a/puppet/blockstorage.yaml b/puppet/blockstorage-role.yaml index a66ea08b..2b197a24 100644 --- a/puppet/blockstorage.yaml +++ b/puppet/blockstorage-role.yaml @@ -315,6 +315,51 @@ outputs: hostname: description: Hostname of the server value: {get_attr: [BlockStorage, name]} + hostname_map: + description: Mapping of network names to hostnames + value: + external: + list_join: + - '.' + - - {get_attr: [BlockStorage, name]} + - external + - {get_param: CloudDomain} + internal_api: + list_join: + - '.' + - - {get_attr: [BlockStorage, name]} + - internalapi + - {get_param: CloudDomain} + storage: + list_join: + - '.' + - - {get_attr: [BlockStorage, name]} + - storage + - {get_param: CloudDomain} + storage_mgmt: + list_join: + - '.' + - - {get_attr: [BlockStorage, name]} + - storagemgmt + - {get_param: CloudDomain} + tenant: + list_join: + - '.' + - - {get_attr: [BlockStorage, name]} + - tenant + - {get_param: CloudDomain} + management: + list_join: + - '.' + - - {get_attr: [BlockStorage, name]} + - management + - {get_param: CloudDomain} + ctlplane: + list_join: + - '.' + - - {get_attr: [BlockStorage, name]} + - ctlplane + - {get_param: CloudDomain} hosts_entry: value: str_replace: diff --git a/puppet/cephstorage-config.yaml b/puppet/cephstorage-config.yaml deleted file mode 100644 index 09757ea7..00000000 --- a/puppet/cephstorage-config.yaml +++ /dev/null @@ -1,44 +0,0 @@ -heat_template_version: 2015-04-30 - -description: > - A software config which runs applies puppet on the cephstorage role - -parameters: - ConfigDebug: - default: false - description: Whether to run config management (e.g. Puppet) in debug mode. - type: boolean - StepConfig: - type: string - description: Config manifests that will be used to step through the deployment. - default: '' - -resources: - - CephStoragePuppetConfigImpl: - type: OS::Heat::SoftwareConfig - properties: - group: puppet - options: - enable_debug: {get_param: ConfigDebug} - enable_hiera: True - enable_facter: False - modulepath: /etc/puppet/modules:/opt/stack/puppet-modules:/usr/share/openstack-puppet/modules - inputs: - - name: step - type: Number - outputs: - - name: result - config: - list_join: - - '' - - - str_replace: - template: {get_file: manifests/overcloud_role.pp} - params: - __ROLE__: cephstorage - - {get_param: StepConfig} - -outputs: - OS::stack_id: - description: The software config which applies puppet on the cephstorage role - value: {get_resource: CephStoragePuppetConfigImpl} diff --git a/puppet/cephstorage.yaml b/puppet/cephstorage-role.yaml index 03a53b00..3716f9ed 100644 --- a/puppet/cephstorage.yaml +++ b/puppet/cephstorage-role.yaml @@ -325,6 +325,51 @@ outputs: hostname: description: Hostname of the server value: {get_attr: [CephStorage, name]} + hostname_map: + description: Mapping of network names to hostnames + value: + external: + list_join: + - '.' + - - {get_attr: [CephStorage, name]} + - external + - {get_param: CloudDomain} + internal_api: + list_join: + - '.' + - - {get_attr: [CephStorage, name]} + - internalapi + - {get_param: CloudDomain} + storage: + list_join: + - '.' + - - {get_attr: [CephStorage, name]} + - storage + - {get_param: CloudDomain} + storage_mgmt: + list_join: + - '.' + - - {get_attr: [CephStorage, name]} + - storagemgmt + - {get_param: CloudDomain} + tenant: + list_join: + - '.' + - - {get_attr: [CephStorage, name]} + - tenant + - {get_param: CloudDomain} + management: + list_join: + - '.' + - - {get_attr: [CephStorage, name]} + - management + - {get_param: CloudDomain} + ctlplane: + list_join: + - '.' + - - {get_attr: [CephStorage, name]} + - ctlplane + - {get_param: CloudDomain} hosts_entry: value: str_replace: diff --git a/puppet/compute.yaml b/puppet/compute-role.yaml index 0205d0a6..ff30d209 100644 --- a/puppet/compute.yaml +++ b/puppet/compute-role.yaml @@ -368,6 +368,51 @@ outputs: hostname: description: Hostname of the server value: {get_attr: [NovaCompute, name]} + hostname_map: + description: Mapping of network names to hostnames + value: + external: + list_join: + - '.' + - - {get_attr: [NovaCompute, name]} + - external + - {get_param: CloudDomain} + internal_api: + list_join: + - '.' + - - {get_attr: [NovaCompute, name]} + - internalapi + - {get_param: CloudDomain} + storage: + list_join: + - '.' + - - {get_attr: [NovaCompute, name]} + - storage + - {get_param: CloudDomain} + storage_mgmt: + list_join: + - '.' + - - {get_attr: [NovaCompute, name]} + - storagemgmt + - {get_param: CloudDomain} + tenant: + list_join: + - '.' + - - {get_attr: [NovaCompute, name]} + - tenant + - {get_param: CloudDomain} + management: + list_join: + - '.' + - - {get_attr: [NovaCompute, name]} + - management + - {get_param: CloudDomain} + ctlplane: + list_join: + - '.' + - - {get_attr: [NovaCompute, name]} + - ctlplane + - {get_param: CloudDomain} hosts_entry: description: > Server's IP address and hostname in the /etc/hosts format diff --git a/puppet/compute-config.yaml b/puppet/config.role.j2.yaml index acc9e61d..e59a0216 100644 --- a/puppet/compute-config.yaml +++ b/puppet/config.role.j2.yaml @@ -1,7 +1,7 @@ heat_template_version: 2015-04-30 description: > - A software config which applies puppet on the compute role + A software config which runs puppet on the {{role}} role parameters: ConfigDebug: @@ -15,7 +15,7 @@ parameters: resources: - ComputePuppetConfigImpl: + {{role}}PuppetConfigImpl: type: OS::Heat::SoftwareConfig properties: group: puppet @@ -24,21 +24,21 @@ resources: enable_hiera: True enable_facter: False modulepath: /etc/puppet/modules:/opt/stack/puppet-modules:/usr/share/openstack-puppet/modules + outputs: + - name: result inputs: - name: step type: Number - outputs: - - name: result config: list_join: - '' - - str_replace: template: {get_file: manifests/overcloud_role.pp} params: - __ROLE__: compute + __ROLE__: {{role.lower()}} - {get_param: StepConfig} outputs: OS::stack_id: - description: The software config which applies puppet on the compute role - value: {get_resource: ComputePuppetConfigImpl} + description: The software config which runs puppet on the {{role}} role + value: {get_resource: {{role}}PuppetConfigImpl} diff --git a/puppet/controller-config.yaml b/puppet/controller-config.yaml deleted file mode 100644 index 39963479..00000000 --- a/puppet/controller-config.yaml +++ /dev/null @@ -1,44 +0,0 @@ -heat_template_version: 2015-04-30 - -description: > - A software config which runs puppet on the controller role - -parameters: - ConfigDebug: - default: false - description: Whether to run config management (e.g. Puppet) in debug mode. - type: boolean - StepConfig: - type: string - description: Config manifests that will be used to step through the deployment. - default: '' - -resources: - - ControllerPuppetConfigImpl: - type: OS::Heat::SoftwareConfig - properties: - group: puppet - options: - enable_debug: {get_param: ConfigDebug} - enable_hiera: True - enable_facter: False - modulepath: /etc/puppet/modules:/opt/stack/puppet-modules:/usr/share/openstack-puppet/modules - outputs: - - name: result - inputs: - - name: step - type: Number - config: - list_join: - - '' - - - str_replace: - template: {get_file: manifests/overcloud_role.pp} - params: - __ROLE__: controller - - {get_param: StepConfig} - -outputs: - OS::stack_id: - description: The software config which runs puppet on the controller role - value: {get_resource: ControllerPuppetConfigImpl} diff --git a/puppet/controller.yaml b/puppet/controller-role.yaml index ccb517f8..e18126fa 100644 --- a/puppet/controller.yaml +++ b/puppet/controller-role.yaml @@ -411,6 +411,51 @@ outputs: hostname: description: Hostname of the server value: {get_attr: [Controller, name]} + hostname_map: + description: Mapping of network names to hostnames + value: + external: + list_join: + - '.' + - - {get_attr: [Controller, name]} + - external + - {get_param: CloudDomain} + internal_api: + list_join: + - '.' + - - {get_attr: [Controller, name]} + - internalapi + - {get_param: CloudDomain} + storage: + list_join: + - '.' + - - {get_attr: [Controller, name]} + - storage + - {get_param: CloudDomain} + storage_mgmt: + list_join: + - '.' + - - {get_attr: [Controller, name]} + - storagemgmt + - {get_param: CloudDomain} + tenant: + list_join: + - '.' + - - {get_attr: [Controller, name]} + - tenant + - {get_param: CloudDomain} + management: + list_join: + - '.' + - - {get_attr: [Controller, name]} + - management + - {get_param: CloudDomain} + ctlplane: + list_join: + - '.' + - - {get_attr: [Controller, name]} + - ctlplane + - {get_param: CloudDomain} hosts_entry: description: > Server's IP address and hostname in the /etc/hosts format diff --git a/puppet/objectstorage-config.yaml b/puppet/objectstorage-config.yaml deleted file mode 100644 index 76bffdd1..00000000 --- a/puppet/objectstorage-config.yaml +++ /dev/null @@ -1,44 +0,0 @@ -heat_template_version: 2015-04-30 - -description: > - A software config which applies puppet on the objectstorage role - -parameters: - ConfigDebug: - default: false - description: Whether to run config management (e.g. Puppet) in debug mode. - type: boolean - StepConfig: - type: string - description: Config manifests that will be used to step through the deployment. - default: '' - -resources: - - ObjectStoragePuppetConfigImpl: - type: OS::Heat::SoftwareConfig - properties: - group: puppet - options: - enable_debug: {get_param: ConfigDebug} - enable_hiera: True - enable_facter: False - modulepath: /etc/puppet/modules:/opt/stack/puppet-modules:/usr/share/openstack-puppet/modules - inputs: - - name: step - type: Number - outputs: - - name: result - config: - list_join: - - '' - - - str_replace: - template: {get_file: manifests/overcloud_role.pp} - params: - __ROLE__: objectstorage - - {get_param: StepConfig} - -outputs: - OS::stack_id: - description: The software config which applies puppet on the objectstorage role - value: {get_resource: ObjectStoragePuppetConfigImpl} diff --git a/puppet/objectstorage.yaml b/puppet/objectstorage-role.yaml index 899ba66d..0914c912 100644 --- a/puppet/objectstorage.yaml +++ b/puppet/objectstorage-role.yaml @@ -314,6 +314,51 @@ outputs: hostname: description: Hostname of the server value: {get_attr: [SwiftStorage, name]} + hostname_map: + description: Mapping of network names to hostnames + value: + external: + list_join: + - '.' + - - {get_attr: [SwiftStorage, name]} + - external + - {get_param: CloudDomain} + internal_api: + list_join: + - '.' + - - {get_attr: [SwiftStorage, name]} + - internalapi + - {get_param: CloudDomain} + storage: + list_join: + - '.' + - - {get_attr: [SwiftStorage, name]} + - storage + - {get_param: CloudDomain} + storage_mgmt: + list_join: + - '.' + - - {get_attr: [SwiftStorage, name]} + - storagemgmt + - {get_param: CloudDomain} + tenant: + list_join: + - '.' + - - {get_attr: [SwiftStorage, name]} + - tenant + - {get_param: CloudDomain} + management: + list_join: + - '.' + - - {get_attr: [SwiftStorage, name]} + - management + - {get_param: CloudDomain} + ctlplane: + list_join: + - '.' + - - {get_attr: [SwiftStorage, name]} + - ctlplane + - {get_param: CloudDomain} hosts_entry: value: str_replace: |