diff options
Diffstat (limited to 'lib')
| -rwxr-xr-x | lib/overcloud-deploy-functions.sh | 6 | ||||
| -rw-r--r-- | lib/python/apex/common/constants.py | 1 | ||||
| -rw-r--r-- | lib/python/apex/network_settings.py | 4 | ||||
| -rwxr-xr-x | lib/undercloud-functions.sh | 11 |
4 files changed, 19 insertions, 3 deletions
diff --git a/lib/overcloud-deploy-functions.sh b/lib/overcloud-deploy-functions.sh index 992d22af..a08739ab 100755 --- a/lib/overcloud-deploy-functions.sh +++ b/lib/overcloud-deploy-functions.sh @@ -183,9 +183,8 @@ EOI DEPLOY_OPTIONS+=" --ntp-server $ntp_server" fi - if [[ ! "$virtual" == "TRUE" ]]; then - DEPLOY_OPTIONS+=" --control-flavor control --compute-flavor compute" - else + DEPLOY_OPTIONS+=" --control-flavor control --compute-flavor compute" + if [[ "$virtual" == "TRUE" ]]; then DEPLOY_OPTIONS+=" -e virtual-environment.yaml" fi @@ -230,6 +229,7 @@ for dns_server in ${dns_servers}; do dns_server_ext="\${dns_server_ext} --dns-nameserver \${dns_server}" done neutron subnet-update \$(neutron subnet-list | grep -Ev "id|tenant|external|storage" | grep -v \\\\-\\\\- | awk {'print \$2'}) \${dns_server_ext} +sed -i '/CloudDomain:/c\ CloudDomain: '${domain_name} opnfv-environment.yaml echo "Executing overcloud deployment, this should run for an extended period without output." sleep 60 #wait for Hypervisor stats to check-in to nova # save deploy command so it can be used for debugging diff --git a/lib/python/apex/common/constants.py b/lib/python/apex/common/constants.py index dfed33f8..996ef2f0 100644 --- a/lib/python/apex/common/constants.py +++ b/lib/python/apex/common/constants.py @@ -16,3 +16,4 @@ OPNFV_NETWORK_TYPES = [ADMIN_NETWORK, PRIVATE_NETWORK, PUBLIC_NETWORK, STORAGE_NETWORK, API_NETWORK] DNS_SERVERS = ["8.8.8.8", "8.8.4.4"] ROLES = ['compute', 'controller'] +DOMAIN_NAME = 'localdomain.com' diff --git a/lib/python/apex/network_settings.py b/lib/python/apex/network_settings.py index fd6c1455..f2807664 100644 --- a/lib/python/apex/network_settings.py +++ b/lib/python/apex/network_settings.py @@ -75,6 +75,8 @@ class NetworkSettings: self.settings_obj['dns_servers'] = self.settings_obj.get( 'dns_servers', constants.DNS_SERVERS) + self.settings_obj['domain_name'] = self.settings_obj.get( + 'domain_name', constants.DOMAIN_NAME) def _validate_overcloud_nic_order(self, network): """ @@ -281,6 +283,8 @@ class NetworkSettings: dns_list = dns_list + "{} ".format(dns_server) dns_list = dns_list.strip() bash_str += "dns_servers=\'{}\'\n".format(dns_list) + bash_str += "domain_name=\'{}\'\n".format(self.settings_obj[ + 'domain_name']) if path: with open(path, 'w') as file: file.write(bash_str) diff --git a/lib/undercloud-functions.sh b/lib/undercloud-functions.sh index f829e980..f1c42865 100755 --- a/lib/undercloud-functions.sh +++ b/lib/undercloud-functions.sh @@ -211,6 +211,7 @@ if [[ "$net_isolation_enabled" == "TRUE" ]]; then openstack-config --set undercloud.conf DEFAULT dhcp_end ${admin_network_dhcp_range##*,} openstack-config --set undercloud.conf DEFAULT inspection_iprange ${admin_network_introspection_range} openstack-config --set undercloud.conf DEFAULT undercloud_debug false + openstack-config --set undercloud.conf DEFAULT undercloud_hostname "undercloud.${domain_name}" fi @@ -236,8 +237,18 @@ openstack undercloud install &> apex-undercloud-install.log || { sleep 30 sudo systemctl restart openstack-glance-api +# Set nova domain name +sudo openstack-config --set /etc/nova/nova.conf DEFAULT dns_domain ${domain_name} +sudo openstack-config --set /etc/nova/nova.conf DEFAULT dhcp_domain ${domain_name} sudo systemctl restart openstack-nova-conductor sudo systemctl restart openstack-nova-compute +sudo systemctl restart openstack-nova-api +sudo systemctl restart openstack-nova-scheduler + +# Set neutron domain name +sudo openstack-config --set /etc/neutron/neutron.conf DEFAULT dns_domain ${domain_name} +sudo systemctl restart neutron-server +sudo systemctl restart neutron-dhcp-agent sudo sed -i '/num_engine_workers/c\num_engine_workers = 2' /etc/heat/heat.conf sudo sed -i '/#workers\s=/c\workers = 2' /etc/heat/heat.conf |