diff options
Diffstat (limited to 'lib')
| -rwxr-xr-x | lib/overcloud-deploy-functions.sh | 1 | ||||
| -rw-r--r-- | lib/python/apex/common/constants.py | 2 | ||||
| -rw-r--r-- | lib/python/apex/network_settings.py | 52 | ||||
| -rwxr-xr-x | lib/python/apex_python_utils.py | 10 | ||||
| -rwxr-xr-x | lib/undercloud-functions.sh | 11 |
5 files changed, 72 insertions, 4 deletions
diff --git a/lib/overcloud-deploy-functions.sh b/lib/overcloud-deploy-functions.sh index 36522402..a08739ab 100755 --- a/lib/overcloud-deploy-functions.sh +++ b/lib/overcloud-deploy-functions.sh @@ -229,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 8ed49ff7..996ef2f0 100644 --- a/lib/python/apex/common/constants.py +++ b/lib/python/apex/common/constants.py @@ -15,3 +15,5 @@ API_NETWORK = 'api_network' 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 50dd15c3..f2807664 100644 --- a/lib/python/apex/network_settings.py +++ b/lib/python/apex/network_settings.py @@ -31,6 +31,8 @@ class NetworkSettings: self.settings_obj = yaml.load(network_settings_file) self.network_isolation = network_isolation self.enabled_network_list = [] + self.nics = {'compute': dict(), 'controller': dict()} + self.nics_specified = {'compute': False, 'controller': False} self._validate_input() def _validate_input(self): @@ -63,6 +65,7 @@ class NetworkSettings: start_offset=21, end_offset=21) self._config_optional_settings(network) self.enabled_network_list.append(network) + self._validate_overcloud_nic_order(network) else: logging.info("{} disabled, will collapse with " "admin_network".format(network)) @@ -72,6 +75,53 @@ 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): + """ + Detects if nic order is specified per profile (compute/controller) + for network + + If nic order is specified in a network for a profile, it should be + specified for every network with that profile other than admin_network + + Duplicate nic names are also not allowed across different networks + + :param network: network to detect if nic order present + :return: None + """ + + for role in constants.ROLES: + interface = role+'_interface' + nic_index = self.get_enabled_networks().index(network) + 1 + if interface in self.settings_obj[network]: + if any(y == self.settings_obj[network][interface] for x, y in + self.nics[role].items()): + raise NetworkSettingsException("Duplicate {} already " + "specified for " + "another network" + .format(self.settings_obj + [network] + [interface])) + self.nics[role][network] = self.settings_obj[network][ + interface] + self.nics_specified[role] = True + logging.info("{} nic order specified for network {" + "}".format(role, network)) + elif self.nics_specified[role]: + logging.error("{} nic order not specified for network {" + "}".format(role, network)) + raise NetworkSettingsException("Must specify {} for all " + "enabled networks (other than " + " admin) or not specify it for " + "any".format(interface)) + else: + logging.info("{} nic order not specified for network {" + "}. Will use logical default " + "nic{}".format(interface, network, nic_index)) + self.nics[role][network] = 'nic' + str(nic_index) + nic_index += 1 def _config_required_settings(self, network): """ @@ -233,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/python/apex_python_utils.py b/lib/python/apex_python_utils.py index 1a3cb159..bc9bc56f 100755 --- a/lib/python/apex_python_utils.py +++ b/lib/python/apex_python_utils.py @@ -22,7 +22,6 @@ from apex import NetworkSettings from apex import NetworkEnvironment from apex import DeploySettings from apex import ip_utils -from apex.common.constants import OPNFV_NETWORK_TYPES from apex.common.constants import ADMIN_NETWORK @@ -94,8 +93,9 @@ def build_nic_template(args): """ template_dir, template = args.template.rsplit('/', 1) - settings = NetworkSettings(args.net_settings_file, - args.network_isolation).settings_obj + network_settings = NetworkSettings(args.net_settings_file, + args.network_isolation) + settings = network_settings.settings_obj env = Environment(loader=FileSystemLoader(template_dir)) template = env.get_template(template) @@ -104,13 +104,15 @@ def build_nic_template(args): net_list.remove(ADMIN_NETWORK) vlans_vals = map(lambda x: settings[x]['vlan'], net_list) vlans = dict(zip(net_list, vlans_vals)) + nics = network_settings.nics print(template.render(enabled_networks=args.enabled_networks, role=args.role, vlans=vlans, external_net_type=args.ext_net_type, external_net_af=args.address_family, - ovs_dpdk_bridge=args.ovs_dpdk_bridge)) + ovs_dpdk_bridge=args.ovs_dpdk_bridge, + nics=nics)) def get_parser(): 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 |