diff options
| author |   Zuul <zuul@review.openstack.org> | 2017-11-10 17:15:39 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-11-10 17:15:39 +0000 |
| commit | df64ca710bb69f1b2db3fead86e836076f842c14 (patch) | |
| tree | b8268eaf3afde34f607f9ca65d870ffb18921260 /puppet | |
| parent | e0ec12d40bf4ceae872fbb792dfbb8a1830560a4 (diff) | |
| parent | 4217767d8782abae02b11f553fc14daf7cd72916 (diff) | |
Merge "Refactor cellv2 host discovery logic to avoid races" into stable/pike
Diffstat (limited to 'puppet')
| -rw-r--r-- | puppet/all-nodes-config.j2.yaml | 6 | ||||
| -rw-r--r-- | puppet/role.role.j2.yaml | 10 |
2 files changed, 16 insertions, 0 deletions
diff --git a/puppet/all-nodes-config.j2.yaml b/puppet/all-nodes-config.j2.yaml index bdd2bcf3..65949625 100644 --- a/puppet/all-nodes-config.j2.yaml +++ b/puppet/all-nodes-config.j2.yaml @@ -22,6 +22,8 @@ parameters: type: json controller_names: type: comma_delimited_list + cellv2_discovery_hosts: + type: comma_delimited_list NetVipMap: type: json RedisVirtualIP: @@ -141,6 +143,10 @@ resources: list_join: - ',' - {get_param: controller_names} + - cellv2_discovery_hosts: + list_join: + - ',' + - {get_param: cellv2_discovery_hosts} deploy_identifier: {get_param: DeployIdentifier} update_identifier: {get_param: UpdateIdentifier} stack_action: {get_param: StackAction} diff --git a/puppet/role.role.j2.yaml b/puppet/role.role.j2.yaml index d53afd04..a3cbe851 100644 --- a/puppet/role.role.j2.yaml +++ b/puppet/role.role.j2.yaml @@ -477,6 +477,14 @@ resources: - '.' - - {get_attr: [{{server_resource_name}}, name]} - ctlplane + canonical: + fqdn: + list_join: + - '.' + - - {get_attr: [{{server_resource_name}}, name]} + - {get_param: CloudDomain} + short: + - {get_attr: [{{server_resource_name}}, name]} PreNetworkConfig: type: OS::TripleO::{{role.name}}::PreNetworkConfig @@ -602,6 +610,7 @@ resources: fqdn_management: {get_attr: [NetHostMap, value, management, fqdn]} fqdn_ctlplane: {get_attr: [NetHostMap, value, ctlplane, fqdn]} fqdn_external: {get_attr: [NetHostMap, value, external, fqdn]} + fqdn_canonical: {get_attr: [NetHostMap, value, canonical, fqdn]} # Resource for site-specific injection of root certificate NodeTLSCAData: @@ -696,6 +705,7 @@ outputs: {{network.name_lower|default(network.name.lower())}}: {get_attr: [NetHostMap, value, {{network.name_lower|default(network.name.lower()) }}, fqdn]} {%- endfor %} ctlplane: {get_attr: [NetHostMap, value, ctlplane, fqdn]} + canonical: {get_attr: [NetHostMap, value, canonical, fqdn]} hosts_entry: value: str_replace: |