Skip to content

Commit 8942890

Browse files
Merge pull request #1276 from renjingxiao/clouddomain
Align uni01alpha CloudDomain and NeutronDnsDomain with other jobs
2 parents 68e4474 + c7ccaec commit 8942890

2 files changed

Lines changed: 10 additions & 10 deletions

File tree

scenarios/uni01alpha.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ undercloud:
33
config:
44
- section: DEFAULT
55
option: undercloud_hostname
6-
value: undercloud.localdomain
6+
value: undercloud.example.com
77
- section: DEFAULT
88
option: undercloud_timezone
99
value: UTC
@@ -22,7 +22,7 @@ undercloud:
2222
undercloud_parameters_override: "uni01alpha/hieradata_overrides_undercloud.yaml"
2323
undercloud_parameters_defaults: "uni01alpha/undercloud_parameter_defaults.yaml"
2424
ctlplane_vip: 192.168.122.101
25-
cloud_domain: "localdomain"
25+
cloud_domain: "example.com"
2626
hostname_groups_map:
2727
# map ansible groups in the inventory to role hostname format for
2828
# 17.1 deployment

scenarios/uni01alpha/config_download.yaml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ parameter_defaults:
5353
ComputeExtraConfig:
5454
nova::compute::libvirt::services::libvirt_virt_type: qemu
5555
nova::compute::libvirt::virt_type: qemu
56-
NeutronDnsDomain: 'openstackgate.local'
56+
NeutronDnsDomain: 'example.com'
5757
BarbicanSimpleCryptoGlobalDefault: true
5858
SwiftEncryptionEnabled: true
5959
Debug: true
@@ -64,19 +64,19 @@ parameter_defaults:
6464
NetworkerCount: 3
6565
NeutronGlobalPhysnetMtu: 1500
6666
CinderLVMLoopDeviceSize: 20480
67-
CloudName: overcloud.localdomain
68-
CloudNameInternal: overcloud.internalapi.localdomain
69-
CloudNameStorage: overcloud.storage.localdomain
70-
CloudNameStorageManagement: overcloud.storagemgmt.localdomain
71-
CloudNameCtlplane: overcloud.ctlplane.localdomain
72-
CloudDomain: localdomain
67+
CloudName: overcloud.example.com
68+
CloudNameInternal: overcloud.internalapi.example.com
69+
CloudNameStorage: overcloud.storage.example.com
70+
CloudNameStorageManagement: overcloud.storagemgmt.example.com
71+
CloudNameCtlplane: overcloud.ctlplane.example.com
72+
CloudDomain: example.com
7373
NetworkConfigWithAnsible: false
7474
ControllerHostnameFormat: '%stackname%-controller-%index%'
7575
ComputeHostnameFormat: '%stackname%-compute-%index%'
7676
NetworkerHostnameFormat: '%stackname%-networker-%index%'
7777
CtlplaneNetworkAttributes:
7878
network:
79-
dns_domain: localdomain
79+
dns_domain: example.com
8080
mtu: 1500
8181
name: ctlplane
8282
tags:

0 commit comments

Comments
 (0)