diff options
| -rwxr-xr-x | build/overcloud-full.sh | 9 | ||||
| -rw-r--r-- | build/variables.sh | 8 | ||||
| -rwxr-xr-x | ci/deploy.sh | 11 | ||||
| -rw-r--r-- | lib/python/apex/common/constants.py | 1 | ||||
| -rw-r--r-- | lib/python/apex/network_settings.py | 3 |
5 files changed, 26 insertions, 6 deletions
diff --git a/build/overcloud-full.sh b/build/overcloud-full.sh index 065201f8..af978edb 100755 --- a/build/overcloud-full.sh +++ b/build/overcloud-full.sh @@ -23,10 +23,19 @@ mv -f images/overcloud-full.qcow2 images/overcloud-full_build.qcow2 pushd images > /dev/null +dpdk_pkg_str='' +for package in ${dpdk_rpms[@]}; do + curl -O "$dpdk_uri_base/$package" + dpdk_pkg_str+=" --upload $package:/root/dpdk_rpms" +done + # remove openstack-neutron-openvswitch, ain't nobody need that in OPNFV # enable connection tracking for protocal sctp +# upload dpdk rpms but do not install LIBGUESTFS_BACKEND=direct virt-customize \ --run-command "echo 'nf_conntrack_proto_sctp' > /etc/modules-load.d/nf_conntrack_proto_sctp.conf" \ + --run-command "mkdir /root/dpdk_rpms" \ + $dpdk_pkg_str \ -a overcloud-full_build.qcow2 mv -f overcloud-full_build.qcow2 overcloud-full.qcow2 diff --git a/build/variables.sh b/build/variables.sh index 115650da..ad1edf91 100644 --- a/build/variables.sh +++ b/build/variables.sh @@ -11,3 +11,11 @@ rdo_images_uri=https://ci.centos.org/artifacts/rdo/images/mitaka/delorean/stable/ onos_release_uri=https://dl.dropboxusercontent.com/u/7079970/ onos_release_file=onos-1.5.0.tar.gz + +dpdk_uri_base=http://artifacts.opnfv.org/ovsnfv +dpdk_rpms=( +'ovs4opnfv-dpdk-16.04.0-2.el7.centos.x86_64.rpm' +'ovs4opnfv-dpdk-devel-16.04.0-2.el7.centos.x86_64.rpm' +'ovs4opnfv-dpdk-examples-16.04.0-2.el7.centos.x86_64.rpm' +'ovs4opnfv-dpdk-tools-16.04.0-2.el7.centos.x86_64.rpm' +)
\ No newline at end of file diff --git a/ci/deploy.sh b/ci/deploy.sh index da1d29e2..7c07ae63 100755 --- a/ci/deploy.sh +++ b/ci/deploy.sh @@ -803,11 +803,7 @@ function undercloud_prep_overcloud_deploy { exit 1 fi - # Handle different dataplanes - if [ "${deploy_options_array['dataplane']}" != 'ovs' ]; then - echo "${red}ovs is the only currently available dataplane. ${deploy_options_array['dataplane']} not implemented${reset}" - exit 1 - fi + # Make sure the correct overcloud image is available if [ ! -f $RESOURCES/overcloud-full-${SDN_IMAGE}.qcow2 ]; then @@ -841,9 +837,12 @@ EOF --upload uio_pci_generic.modules:/etc/sysconfig/modules/ \ --run-command "chmod 0755 /etc/sysconfig/modules/vfio_pci.modules" \ --run-command "chmod 0755 /etc/sysconfig/modules/uio_pci_generic.modules" \ + --run-command "yum install -y /root/dpdk_rpms/*" \ -a overcloud-full.qcow2 EOI - + elif [ "${deploy_options_array['dataplane']}" != 'ovs' ]; then + echo "${red}${deploy_options_array['dataplane']} not supported${reset}" + exit 1 fi # Set ODL version accordingly diff --git a/lib/python/apex/common/constants.py b/lib/python/apex/common/constants.py index 506b7b2b..8ed49ff7 100644 --- a/lib/python/apex/common/constants.py +++ b/lib/python/apex/common/constants.py @@ -14,3 +14,4 @@ STORAGE_NETWORK = 'storage_network' 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"] diff --git a/lib/python/apex/network_settings.py b/lib/python/apex/network_settings.py index ea7f4ca9..1ddf4620 100644 --- a/lib/python/apex/network_settings.py +++ b/lib/python/apex/network_settings.py @@ -70,6 +70,9 @@ class NetworkSettings: logging.info("{} is not in specified, will collapse with " "admin_network".format(network)) + self.settings_obj['dns_servers'] = self.settings_obj.get( + 'dns_servers', constants.DNS_SERVERS) + def _config_required_settings(self, network): """ Configures either CIDR or bridged_interface setting |