summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-06-15 21:52:41 +0000
committerGerrit Code Review <review@openstack.org>2017-06-15 21:52:41 +0000
commit8be72939201a9b38193d01dae7d059840df16470 (patch)
treeac59332d3a2cfadde1c88b05491d8f5615b9f8ee
parent61d2dfc01f022774b5967e3da67f368759f51a78 (diff)
parentcd7b49795daa36f95ccf966a134af6dd696ab67b (diff)
Merge "Add fqdn_external" into stable/ocata
-rw-r--r--puppet/blockstorage-role.yaml1
-rw-r--r--puppet/cephstorage-role.yaml1
-rw-r--r--puppet/compute-role.yaml1
-rw-r--r--puppet/controller-role.yaml1
-rw-r--r--puppet/objectstorage-role.yaml1
-rw-r--r--puppet/role.role.j2.yaml1
6 files changed, 6 insertions, 0 deletions
diff --git a/puppet/blockstorage-role.yaml b/puppet/blockstorage-role.yaml
index 16fb4b9..222dbb1 100644
--- a/puppet/blockstorage-role.yaml
+++ b/puppet/blockstorage-role.yaml
@@ -427,6 +427,7 @@ resources:
427 fqdn_tenant: {get_attr: [NetHostMap, value, tenant, fqdn]} 427 fqdn_tenant: {get_attr: [NetHostMap, value, tenant, fqdn]}
428 fqdn_management: {get_attr: [NetHostMap, value, management, fqdn]} 428 fqdn_management: {get_attr: [NetHostMap, value, management, fqdn]}
429 fqdn_ctlplane: {get_attr: [NetHostMap, value, ctlplane, fqdn]} 429 fqdn_ctlplane: {get_attr: [NetHostMap, value, ctlplane, fqdn]}
430 fqdn_external: {get_attr: [NetHostMap, value, external, fqdn]}
430 431
431 # Resource for site-specific injection of root certificate 432 # Resource for site-specific injection of root certificate
432 NodeTLSCAData: 433 NodeTLSCAData:
diff --git a/puppet/cephstorage-role.yaml b/puppet/cephstorage-role.yaml
index 4b02245..29f8203 100644
--- a/puppet/cephstorage-role.yaml
+++ b/puppet/cephstorage-role.yaml
@@ -432,6 +432,7 @@ resources:
432 fqdn_tenant: {get_attr: [NetHostMap, value, tenant, fqdn]} 432 fqdn_tenant: {get_attr: [NetHostMap, value, tenant, fqdn]}
433 fqdn_management: {get_attr: [NetHostMap, value, management, fqdn]} 433 fqdn_management: {get_attr: [NetHostMap, value, management, fqdn]}
434 fqdn_ctlplane: {get_attr: [NetHostMap, value, ctlplane, fqdn]} 434 fqdn_ctlplane: {get_attr: [NetHostMap, value, ctlplane, fqdn]}
435 fqdn_external: {get_attr: [NetHostMap, value, external, fqdn]}
435 436
436 # Resource for site-specific injection of root certificate 437 # Resource for site-specific injection of root certificate
437 NodeTLSCAData: 438 NodeTLSCAData:
diff --git a/puppet/compute-role.yaml b/puppet/compute-role.yaml
index 37331f3..45794c1 100644
--- a/puppet/compute-role.yaml
+++ b/puppet/compute-role.yaml
@@ -445,6 +445,7 @@ resources:
445 fqdn_tenant: {get_attr: [NetHostMap, value, tenant, fqdn]} 445 fqdn_tenant: {get_attr: [NetHostMap, value, tenant, fqdn]}
446 fqdn_management: {get_attr: [NetHostMap, value, management, fqdn]} 446 fqdn_management: {get_attr: [NetHostMap, value, management, fqdn]}
447 fqdn_ctlplane: {get_attr: [NetHostMap, value, ctlplane, fqdn]} 447 fqdn_ctlplane: {get_attr: [NetHostMap, value, ctlplane, fqdn]}
448 fqdn_external: {get_attr: [NetHostMap, value, external, fqdn]}
448 449
449 NovaComputeDeployment: 450 NovaComputeDeployment:
450 type: OS::TripleO::SoftwareDeployment 451 type: OS::TripleO::SoftwareDeployment
diff --git a/puppet/controller-role.yaml b/puppet/controller-role.yaml
index 68623e2..5593d15 100644
--- a/puppet/controller-role.yaml
+++ b/puppet/controller-role.yaml
@@ -501,6 +501,7 @@ resources:
501 fqdn_tenant: {get_attr: [NetHostMap, value, tenant, fqdn]} 501 fqdn_tenant: {get_attr: [NetHostMap, value, tenant, fqdn]}
502 fqdn_management: {get_attr: [NetHostMap, value, management, fqdn]} 502 fqdn_management: {get_attr: [NetHostMap, value, management, fqdn]}
503 fqdn_ctlplane: {get_attr: [NetHostMap, value, ctlplane, fqdn]} 503 fqdn_ctlplane: {get_attr: [NetHostMap, value, ctlplane, fqdn]}
504 fqdn_external: {get_attr: [NetHostMap, value, external, fqdn]}
504 505
505 # Hook for site-specific additional pre-deployment config, e.g extra hieradata 506 # Hook for site-specific additional pre-deployment config, e.g extra hieradata
506 ControllerExtraConfigPre: 507 ControllerExtraConfigPre:
diff --git a/puppet/objectstorage-role.yaml b/puppet/objectstorage-role.yaml
index a329d13..2e3f527 100644
--- a/puppet/objectstorage-role.yaml
+++ b/puppet/objectstorage-role.yaml
@@ -416,6 +416,7 @@ resources:
416 fqdn_tenant: {get_attr: [NetHostMap, value, tenant, fqdn]} 416 fqdn_tenant: {get_attr: [NetHostMap, value, tenant, fqdn]}
417 fqdn_management: {get_attr: [NetHostMap, value, management, fqdn]} 417 fqdn_management: {get_attr: [NetHostMap, value, management, fqdn]}
418 fqdn_ctlplane: {get_attr: [NetHostMap, value, ctlplane, fqdn]} 418 fqdn_ctlplane: {get_attr: [NetHostMap, value, ctlplane, fqdn]}
419 fqdn_external: {get_attr: [NetHostMap, value, external, fqdn]}
419 420
420 SwiftStorageHieraDeploy: 421 SwiftStorageHieraDeploy:
421 type: OS::Heat::StructuredDeployment 422 type: OS::Heat::StructuredDeployment
diff --git a/puppet/role.role.j2.yaml b/puppet/role.role.j2.yaml
index 8f1f314..01a487d 100644
--- a/puppet/role.role.j2.yaml
+++ b/puppet/role.role.j2.yaml
@@ -453,6 +453,7 @@ resources:
453 fqdn_tenant: {get_attr: [NetHostMap, value, tenant, fqdn]} 453 fqdn_tenant: {get_attr: [NetHostMap, value, tenant, fqdn]}
454 fqdn_management: {get_attr: [NetHostMap, value, management, fqdn]} 454 fqdn_management: {get_attr: [NetHostMap, value, management, fqdn]}
455 fqdn_ctlplane: {get_attr: [NetHostMap, value, ctlplane, fqdn]} 455 fqdn_ctlplane: {get_attr: [NetHostMap, value, ctlplane, fqdn]}
456 fqdn_external: {get_attr: [NetHostMap, value, external, fqdn]}
456 457
457 # Resource for site-specific injection of root certificate 458 # Resource for site-specific injection of root certificate
458 NodeTLSCAData: 459 NodeTLSCAData: