Add fqdn_external
In newton, we used to construct the fqdn_$NETWORK in puppet-tripleo for
external, internal_api, storage, storage_mgmt, tenant, management, and
ctrlplane. When this was moved into THT, we accidently dropped external
which leads to deployment failures if a service is moved to the external
network and the configuration consumes the fqdn_external hiera key.
Specifically this is reproduced if the MysqlNetwork is switch to to
exernal, then the deployment fails because the bind address which is set
to use fqdn_external is blank.
Change-Id: I01ad0c14cb3dc38aad7528345c928b86628433c1
Closes-Bug: #1697722
(cherry picked from commit 426de20288
)
This commit is contained in:
parent
628d7a7901
commit
cd7b49795d
@ -427,6 +427,7 @@ resources:
|
|||||||
fqdn_tenant: {get_attr: [NetHostMap, value, tenant, fqdn]}
|
fqdn_tenant: {get_attr: [NetHostMap, value, tenant, fqdn]}
|
||||||
fqdn_management: {get_attr: [NetHostMap, value, management, fqdn]}
|
fqdn_management: {get_attr: [NetHostMap, value, management, fqdn]}
|
||||||
fqdn_ctlplane: {get_attr: [NetHostMap, value, ctlplane, fqdn]}
|
fqdn_ctlplane: {get_attr: [NetHostMap, value, ctlplane, fqdn]}
|
||||||
|
fqdn_external: {get_attr: [NetHostMap, value, external, fqdn]}
|
||||||
|
|
||||||
# Resource for site-specific injection of root certificate
|
# Resource for site-specific injection of root certificate
|
||||||
NodeTLSCAData:
|
NodeTLSCAData:
|
||||||
|
@ -432,6 +432,7 @@ resources:
|
|||||||
fqdn_tenant: {get_attr: [NetHostMap, value, tenant, fqdn]}
|
fqdn_tenant: {get_attr: [NetHostMap, value, tenant, fqdn]}
|
||||||
fqdn_management: {get_attr: [NetHostMap, value, management, fqdn]}
|
fqdn_management: {get_attr: [NetHostMap, value, management, fqdn]}
|
||||||
fqdn_ctlplane: {get_attr: [NetHostMap, value, ctlplane, fqdn]}
|
fqdn_ctlplane: {get_attr: [NetHostMap, value, ctlplane, fqdn]}
|
||||||
|
fqdn_external: {get_attr: [NetHostMap, value, external, fqdn]}
|
||||||
|
|
||||||
# Resource for site-specific injection of root certificate
|
# Resource for site-specific injection of root certificate
|
||||||
NodeTLSCAData:
|
NodeTLSCAData:
|
||||||
|
@ -445,6 +445,7 @@ resources:
|
|||||||
fqdn_tenant: {get_attr: [NetHostMap, value, tenant, fqdn]}
|
fqdn_tenant: {get_attr: [NetHostMap, value, tenant, fqdn]}
|
||||||
fqdn_management: {get_attr: [NetHostMap, value, management, fqdn]}
|
fqdn_management: {get_attr: [NetHostMap, value, management, fqdn]}
|
||||||
fqdn_ctlplane: {get_attr: [NetHostMap, value, ctlplane, fqdn]}
|
fqdn_ctlplane: {get_attr: [NetHostMap, value, ctlplane, fqdn]}
|
||||||
|
fqdn_external: {get_attr: [NetHostMap, value, external, fqdn]}
|
||||||
|
|
||||||
NovaComputeDeployment:
|
NovaComputeDeployment:
|
||||||
type: OS::TripleO::SoftwareDeployment
|
type: OS::TripleO::SoftwareDeployment
|
||||||
|
@ -501,6 +501,7 @@ resources:
|
|||||||
fqdn_tenant: {get_attr: [NetHostMap, value, tenant, fqdn]}
|
fqdn_tenant: {get_attr: [NetHostMap, value, tenant, fqdn]}
|
||||||
fqdn_management: {get_attr: [NetHostMap, value, management, fqdn]}
|
fqdn_management: {get_attr: [NetHostMap, value, management, fqdn]}
|
||||||
fqdn_ctlplane: {get_attr: [NetHostMap, value, ctlplane, fqdn]}
|
fqdn_ctlplane: {get_attr: [NetHostMap, value, ctlplane, fqdn]}
|
||||||
|
fqdn_external: {get_attr: [NetHostMap, value, external, fqdn]}
|
||||||
|
|
||||||
# Hook for site-specific additional pre-deployment config, e.g extra hieradata
|
# Hook for site-specific additional pre-deployment config, e.g extra hieradata
|
||||||
ControllerExtraConfigPre:
|
ControllerExtraConfigPre:
|
||||||
|
@ -416,6 +416,7 @@ resources:
|
|||||||
fqdn_tenant: {get_attr: [NetHostMap, value, tenant, fqdn]}
|
fqdn_tenant: {get_attr: [NetHostMap, value, tenant, fqdn]}
|
||||||
fqdn_management: {get_attr: [NetHostMap, value, management, fqdn]}
|
fqdn_management: {get_attr: [NetHostMap, value, management, fqdn]}
|
||||||
fqdn_ctlplane: {get_attr: [NetHostMap, value, ctlplane, fqdn]}
|
fqdn_ctlplane: {get_attr: [NetHostMap, value, ctlplane, fqdn]}
|
||||||
|
fqdn_external: {get_attr: [NetHostMap, value, external, fqdn]}
|
||||||
|
|
||||||
SwiftStorageHieraDeploy:
|
SwiftStorageHieraDeploy:
|
||||||
type: OS::Heat::StructuredDeployment
|
type: OS::Heat::StructuredDeployment
|
||||||
|
@ -453,6 +453,7 @@ resources:
|
|||||||
fqdn_tenant: {get_attr: [NetHostMap, value, tenant, fqdn]}
|
fqdn_tenant: {get_attr: [NetHostMap, value, tenant, fqdn]}
|
||||||
fqdn_management: {get_attr: [NetHostMap, value, management, fqdn]}
|
fqdn_management: {get_attr: [NetHostMap, value, management, fqdn]}
|
||||||
fqdn_ctlplane: {get_attr: [NetHostMap, value, ctlplane, fqdn]}
|
fqdn_ctlplane: {get_attr: [NetHostMap, value, ctlplane, fqdn]}
|
||||||
|
fqdn_external: {get_attr: [NetHostMap, value, external, fqdn]}
|
||||||
|
|
||||||
# Resource for site-specific injection of root certificate
|
# Resource for site-specific injection of root certificate
|
||||||
NodeTLSCAData:
|
NodeTLSCAData:
|
||||||
|
Loading…
Reference in New Issue
Block a user