diff options
Diffstat (limited to 'build')
| -rw-r--r-- | build/nics-template.yaml.jinja2 | 2 | ||||
| -rw-r--r-- | build/opnfv-apex-common.spec | 2 | ||||
| -rwxr-xr-x | build/overcloud-full.sh | 22 |
3 files changed, 25 insertions, 1 deletions
diff --git a/build/nics-template.yaml.jinja2 b/build/nics-template.yaml.jinja2 index 455ae0f3..91d0c478 100644 --- a/build/nics-template.yaml.jinja2 +++ b/build/nics-template.yaml.jinja2 @@ -94,7 +94,7 @@ resources: name: nic1 # force the MAC address of the bridge to this interface primary: true - {%- if 'public_network' in enabled_networks and vlans['private_network'] is number %} + {%- if 'public_network' in enabled_networks and vlans['public_network'] is number %} - type: vlan vlan_id: {get_param: ExternalNetworkVlanID} diff --git a/build/opnfv-apex-common.spec b/build/opnfv-apex-common.spec index 8808cdb1..5e1a9b36 100644 --- a/build/opnfv-apex-common.spec +++ b/build/opnfv-apex-common.spec @@ -45,6 +45,7 @@ install config/deploy/os-odl_l2-fdio-ha.yaml %{buildroot}%{_sysconfdir}/opnfv-ap install config/deploy/os-odl_l2-fdio-noha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-odl_l2-fdio-noha.yaml install config/deploy/os-odl_l3-nofeature-ha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-odl_l3-nofeature-ha.yaml install config/deploy/os-onos-nofeature-ha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-onos-nofeature-ha.yaml +install config/deploy/os-onos-sfc-ha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-onos-sfc-ha.yaml install config/deploy/os-ocl-nofeature-ha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-ocl-nofeature-ha.yaml install config/network/network_settings.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/network_settings.yaml install config/network/network_settings_v6.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/network_settings_v6.yaml @@ -112,6 +113,7 @@ install config/inventory/pod_example_settings.yaml %{buildroot}%{_docdir}/opnfv/ %{_sysconfdir}/opnfv-apex/os-odl_l2-fdio-ha.yaml %{_sysconfdir}/opnfv-apex/os-odl_l3-nofeature-ha.yaml %{_sysconfdir}/opnfv-apex/os-onos-nofeature-ha.yaml +%{_sysconfdir}/opnfv-apex/os-onos-sfc-ha.yaml %{_sysconfdir}/opnfv-apex/os-ocl-nofeature-ha.yaml %{_sysconfdir}/opnfv-apex/network_settings.yaml %{_sysconfdir}/opnfv-apex/network_settings_v6.yaml diff --git a/build/overcloud-full.sh b/build/overcloud-full.sh index c40a8438..6143b28d 100755 --- a/build/overcloud-full.sh +++ b/build/overcloud-full.sh @@ -58,6 +58,22 @@ pushd puppet-congress > /dev/null git archive --format=tar.gz --prefix=congress/ origin/stable/mitaka > ../puppet-congress.tar.gz popd > /dev/null +# create fd.io yum repo file +cat > /tmp/fdio-master.repo << EOF +[fdio-master] +name=fd.io master branch latest merge +baseurl=https://nexus.fd.io/content/repositories/fd.io.master.centos7/ +enabled=1 +gpgcheck=0 +EOF + +# tar up the fd.io module +rm -rf puppet-fdio +git clone https://github.com/radez/puppet-fdio +pushd puppet-fdio > /dev/null +git archive --format=tar.gz --prefix=fdio/ HEAD > ../puppet-fdio.tar.gz +popd > /dev/null + # installing forked opnfv-puppet-tripleo # enable connection tracking for protocal sctp # upload dpdk rpms but do not install @@ -65,6 +81,8 @@ popd > /dev/null # install the congress rpms # upload and explode the congress puppet module # install doctor driver ## Can be removed in Newton +# install fd.io yum repo and packages +# upload puppet fdio LIBGUESTFS_BACKEND=direct virt-customize \ --upload ../opnfv-puppet-tripleo.tar.gz:/etc/puppet/modules \ --run-command "if ! rpm -qa | grep python-redis; then yum install -y python-redis; fi" \ @@ -85,6 +103,10 @@ LIBGUESTFS_BACKEND=direct virt-customize \ --run-command "cd /etc/puppet/modules/ && tar xzf puppet-congress.tar.gz" \ --run-command "cd /usr/lib/python2.7/site-packages/congress/datasources && curl -O $doctor_driver" \ --run-command "sed -i \"s/'--detailed-exitcodes',/'--detailed-exitcodes','-l','syslog','-l','console',/g\" /var/lib/heat-config/hooks/puppet" \ + --upload /tmp/fdio-master.repo:/etc/yum.repos.d/fdio-master.repo \ + --install unzip,vpp,honeycomb \ + --upload puppet-fdio.tar.gz:/etc/puppet/modules \ + --run-command "cd /etc/puppet/modules && tar xzf puppet-fdio.tar.gz" \ -a overcloud-full_build.qcow2 mv -f overcloud-full_build.qcow2 overcloud-full.qcow2 |