Merge "Add fqdn_external" into stable/ocata
This commit is contained in:
commit
8be7293920
|
@ -427,6 +427,7 @@ resources:
|
|||
fqdn_tenant: {get_attr: [NetHostMap, value, tenant, fqdn]}
|
||||
fqdn_management: {get_attr: [NetHostMap, value, management, 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
|
||||
NodeTLSCAData:
|
||||
|
|
|
@ -432,6 +432,7 @@ resources:
|
|||
fqdn_tenant: {get_attr: [NetHostMap, value, tenant, fqdn]}
|
||||
fqdn_management: {get_attr: [NetHostMap, value, management, 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
|
||||
NodeTLSCAData:
|
||||
|
|
|
@ -445,6 +445,7 @@ resources:
|
|||
fqdn_tenant: {get_attr: [NetHostMap, value, tenant, fqdn]}
|
||||
fqdn_management: {get_attr: [NetHostMap, value, management, fqdn]}
|
||||
fqdn_ctlplane: {get_attr: [NetHostMap, value, ctlplane, fqdn]}
|
||||
fqdn_external: {get_attr: [NetHostMap, value, external, fqdn]}
|
||||
|
||||
NovaComputeDeployment:
|
||||
type: OS::TripleO::SoftwareDeployment
|
||||
|
|
|
@ -501,6 +501,7 @@ resources:
|
|||
fqdn_tenant: {get_attr: [NetHostMap, value, tenant, fqdn]}
|
||||
fqdn_management: {get_attr: [NetHostMap, value, management, 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
|
||||
ControllerExtraConfigPre:
|
||||
|
|
|
@ -416,6 +416,7 @@ resources:
|
|||
fqdn_tenant: {get_attr: [NetHostMap, value, tenant, fqdn]}
|
||||
fqdn_management: {get_attr: [NetHostMap, value, management, fqdn]}
|
||||
fqdn_ctlplane: {get_attr: [NetHostMap, value, ctlplane, fqdn]}
|
||||
fqdn_external: {get_attr: [NetHostMap, value, external, fqdn]}
|
||||
|
||||
SwiftStorageHieraDeploy:
|
||||
type: OS::Heat::StructuredDeployment
|
||||
|
|
|
@ -453,6 +453,7 @@ resources:
|
|||
fqdn_tenant: {get_attr: [NetHostMap, value, tenant, fqdn]}
|
||||
fqdn_management: {get_attr: [NetHostMap, value, management, 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
|
||||
NodeTLSCAData:
|
||||
|
|
Loading…
Reference in New Issue