summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-06-19 15:26:26 +0000
committerGerrit Code Review <review@openstack.org>2017-06-19 15:26:27 +0000
commitab6080f94ddb1a0c4b7441064dd2728c98885ada (patch)
treecb09cc8d341b28e8a53ece0188b264a4688a753a
parent4aa02454f3909c44319f207bdf05646207f032ba (diff)
parent4f582439526751f7b12dfcad2a591ea531b6caa1 (diff)
Merge "Update CloudDomain description"
-rw-r--r--overcloud.j2.yaml4
-rw-r--r--puppet/blockstorage-role.yaml4
-rw-r--r--puppet/cephstorage-role.yaml4
-rw-r--r--puppet/compute-role.yaml4
-rw-r--r--puppet/controller-role.yaml4
-rw-r--r--puppet/objectstorage-role.yaml4
-rw-r--r--puppet/role.role.j2.yaml4
7 files changed, 14 insertions, 14 deletions
diff --git a/overcloud.j2.yaml b/overcloud.j2.yaml
index c7db59f..e4c04b4 100644
--- a/overcloud.j2.yaml
+++ b/overcloud.j2.yaml
@@ -101,8 +101,8 @@ parameters:
101 default: 'localdomain' 101 default: 'localdomain'
102 type: string 102 type: string
103 description: > 103 description: >
104 The DNS domain used for the hosts. This should match the dhcp_domain 104 The DNS domain used for the hosts. This must match the
105 configured in the Undercloud neutron. Defaults to localdomain. 105 overcloud_domain_name configured on the undercloud.
106 ServerMetadata: 106 ServerMetadata:
107 default: {} 107 default: {}
108 description: > 108 description: >
diff --git a/puppet/blockstorage-role.yaml b/puppet/blockstorage-role.yaml
index 08bc03a..551a88c 100644
--- a/puppet/blockstorage-role.yaml
+++ b/puppet/blockstorage-role.yaml
@@ -69,8 +69,8 @@ parameters:
69 default: 'localdomain' 69 default: 'localdomain'
70 type: string 70 type: string
71 description: > 71 description: >
72 The DNS domain used for the hosts. This should match the dhcp_domain 72 The DNS domain used for the hosts. This must match the
73 configured in the Undercloud neutron. Defaults to localdomain. 73 overcloud_domain_name configured on the undercloud.
74 BlockStorageServerMetadata: 74 BlockStorageServerMetadata:
75 default: {} 75 default: {}
76 description: > 76 description: >
diff --git a/puppet/cephstorage-role.yaml b/puppet/cephstorage-role.yaml
index 3f59642..4336f3e 100644
--- a/puppet/cephstorage-role.yaml
+++ b/puppet/cephstorage-role.yaml
@@ -75,8 +75,8 @@ parameters:
75 default: 'localdomain' 75 default: 'localdomain'
76 type: string 76 type: string
77 description: > 77 description: >
78 The DNS domain used for the hosts. This should match the dhcp_domain 78 The DNS domain used for the hosts. This must match the
79 configured in the Undercloud neutron. Defaults to localdomain. 79 overcloud_domain_name configured on the undercloud.
80 CephStorageServerMetadata: 80 CephStorageServerMetadata:
81 default: {} 81 default: {}
82 description: > 82 description: >
diff --git a/puppet/compute-role.yaml b/puppet/compute-role.yaml
index 8a3c487..7bcee47 100644
--- a/puppet/compute-role.yaml
+++ b/puppet/compute-role.yaml
@@ -90,8 +90,8 @@ parameters:
90 default: 'localdomain' 90 default: 'localdomain'
91 type: string 91 type: string
92 description: > 92 description: >
93 The DNS domain used for the hosts. This should match the dhcp_domain 93 The DNS domain used for the hosts. This must match the
94 configured in the Undercloud neutron. Defaults to localdomain. 94 overcloud_domain_name configured on the undercloud.
95 NovaComputeServerMetadata: 95 NovaComputeServerMetadata:
96 default: {} 96 default: {}
97 description: > 97 description: >
diff --git a/puppet/controller-role.yaml b/puppet/controller-role.yaml
index 6bc2366..6a03265 100644
--- a/puppet/controller-role.yaml
+++ b/puppet/controller-role.yaml
@@ -104,8 +104,8 @@ parameters:
104 default: 'localdomain' 104 default: 'localdomain'
105 type: string 105 type: string
106 description: > 106 description: >
107 The DNS domain used for the hosts. This should match the dhcp_domain 107 The DNS domain used for the hosts. This must match the
108 configured in the Undercloud neutron. Defaults to localdomain. 108 overcloud_domain_name configured on the undercloud.
109 ControllerServerMetadata: 109 ControllerServerMetadata:
110 default: {} 110 default: {}
111 description: > 111 description: >
diff --git a/puppet/objectstorage-role.yaml b/puppet/objectstorage-role.yaml
index c35bb25..40a5d44 100644
--- a/puppet/objectstorage-role.yaml
+++ b/puppet/objectstorage-role.yaml
@@ -69,8 +69,8 @@ parameters:
69 default: 'localdomain' 69 default: 'localdomain'
70 type: string 70 type: string
71 description: > 71 description: >
72 The DNS domain used for the hosts. This should match the dhcp_domain 72 The DNS domain used for the hosts. This must match the
73 configured in the Undercloud neutron. Defaults to localdomain. 73 overcloud_domain_name configured on the undercloud.
74 SwiftStorageServerMetadata: 74 SwiftStorageServerMetadata:
75 default: {} 75 default: {}
76 description: > 76 description: >
diff --git a/puppet/role.role.j2.yaml b/puppet/role.role.j2.yaml
index b7f4759..f3b4b6b 100644
--- a/puppet/role.role.j2.yaml
+++ b/puppet/role.role.j2.yaml
@@ -85,8 +85,8 @@ parameters:
85 default: 'localdomain' 85 default: 'localdomain'
86 type: string 86 type: string
87 description: > 87 description: >
88 The DNS domain used for the hosts. This should match the dhcp_domain 88 The DNS domain used for the hosts. This must match the
89 configured in the Undercloud neutron. Defaults to localdomain. 89 overcloud_domain_name configured on the undercloud.
90 {{role}}ServerMetadata: 90 {{role}}ServerMetadata:
91 default: {} 91 default: {}
92 description: > 92 description: >