diff options
Diffstat (limited to 'build')
| -rw-r--r-- | build/opnfv-apex-common.spec | 12 | ||||
| -rwxr-xr-x | build/overcloud-onos.sh | 21 | ||||
| -rw-r--r-- | build/variables.sh | 7 |
3 files changed, 22 insertions, 18 deletions
diff --git a/build/opnfv-apex-common.spec b/build/opnfv-apex-common.spec index e618ff0f..89fb4030 100644 --- a/build/opnfv-apex-common.spec +++ b/build/opnfv-apex-common.spec @@ -9,9 +9,9 @@ URL: https://gerrit.opnfv.org/gerrit/apex.git Source0: opnfv-apex-common.tar.gz BuildArch: noarch -BuildRequires: python-docutils +BuildRequires: python-docutils python34-devel Requires: openstack-tripleo opnfv-apex-sdn opnfv-apex-undercloud openvswitch qemu-kvm bridge-utils libguestfs-tools -Requires: initscripts net-tools iputils iproute iptables +Requires: initscripts net-tools iputils iproute iptables python34 %description Scripts for OPNFV deployment using RDO Manager @@ -42,6 +42,9 @@ install config/network/network_settings.yaml %{buildroot}%{_sysconfdir}/opnfv-ap mkdir -p %{buildroot}%{_var}/opt/opnfv/lib/ install lib/common-functions.sh %{buildroot}%{_var}/opt/opnfv/lib/ install lib/utility-functions.sh %{buildroot}%{_var}/opt/opnfv/lib/ +mkdir -p %{buildroot}%{python3_sitelib}/apex/ +install lib/python/apex/__init__.py %{buildroot}%{python3_sitelib}/apex/ +install lib/python/apex/ip_utils.py %{buildroot}%{python3_sitelib}/apex/ mkdir -p %{buildroot}%{_var}/opt/opnfv/lib/installer/onos/ install lib/installer/onos/onos_gw_mac_update.sh %{buildroot}%{_var}/opt/opnfv/lib/installer/onos/ @@ -61,6 +64,9 @@ install config/inventory/pod_example_settings.yaml %{buildroot}%{_docdir}/opnfv/ %attr(755,root,root) %{_bindir}/opnfv-util %{_var}/opt/opnfv/lib/common-functions.sh %{_var}/opt/opnfv/lib/utility-functions.sh +%{python3_sitelib}/apex/ip_utils.py +%{python3_sitelib}/apex/__init__.py +%{python3_sitelib}/apex/__pycache__/* %{_var}/opt/opnfv/lib/installer/onos/onos_gw_mac_update.sh %{_sysconfdir}/opnfv-apex/os-nosdn-nofeature-ha.yaml %{_sysconfdir}/opnfv-apex/os-odl_l2-nofeature-ha.yaml @@ -78,6 +84,8 @@ install config/inventory/pod_example_settings.yaml %{buildroot}%{_docdir}/opnfv/ %doc %{_docdir}/opnfv/inventory.yaml.example %changelog +* Fri Apr 15 2016 Feng Pan <fpan@redhat.com> - 3.0-2 +- Adds python ip utility lib. * Mon Apr 11 2016 Tim Rozet <trozet@redhat.com> - 3.0-1 - adding opnfv-util * Mon Apr 04 2016 Dan Radez <dradez@redhat.com> - 3.0-0 diff --git a/build/overcloud-onos.sh b/build/overcloud-onos.sh index 88f0b166..070365d7 100755 --- a/build/overcloud-onos.sh +++ b/build/overcloud-onos.sh @@ -18,23 +18,22 @@ cp -f overcloud-full.qcow2 overcloud-full-onos_build.qcow2 ##### Adding ONOS to overcloud ##### ####################################### -# upload the onos puppet module +# get the onos files rm -rf puppet-onos git clone https://github.com/bobzhouHW/puppet-onos.git -pushd puppet-onos > /dev/null +populate_cache "$onos_release_uri/$onos_release_file" # download jdk, onos and maven dependancy packages. -pushd files -for i in jdk-8u51-linux-x64.tar.gz onos-1.3.0.tar.gz repository.tar; do - populate_cache ${onos_artifacts_uri}/$i - get_cached_file $i -done -popd > /dev/null +#for i in jdk-8u51-linux-x64.tar.gz onos-1.3.0.tar.gz repository.tar; do -popd > /dev/null tar --xform="s:puppet-onos/:onos/:" -czf puppet-onos.tar.gz puppet-onos -LIBGUESTFS_BACKEND=direct virt-customize --upload puppet-onos.tar.gz:/etc/puppet/modules/ \ - --run-command "cd /etc/puppet/modules/ && tar xzf puppet-onos.tar.gz" -a overcloud-full-onos_build.qcow2 +LIBGUESTFS_BACKEND=direct virt-customize --install "java-1.8.0-openjdk" \ + --upload puppet-onos.tar.gz:/etc/puppet/modules/ \ + --run-command "cd /etc/puppet/modules/ && tar xzf puppet-onos.tar.gz" \ + --upload $CACHE_DIR/$onos_release_file:/opt \ + --run-command "cd /opt && tar xzf $onos_release_file" \ + -a overcloud-full-onos_build.qcow2 + mv overcloud-full-onos_build.qcow2 overcloud-full-onos.qcow2 popd > /dev/null diff --git a/build/variables.sh b/build/variables.sh index 5a0de36c..9bb40a9c 100644 --- a/build/variables.sh +++ b/build/variables.sh @@ -8,9 +8,6 @@ # http://www.apache.org/licenses/LICENSE-2.0 ############################################################################## -rdo_images_cache=/stable-images rdo_images_uri=https://ci.centos.org/artifacts/rdo/images/mitaka/delorean/stable/ -#rdo_images_uri=file://$rdo_images_cache -#onos_artifacts_uri=http://205.177.226.237:9999/onosfw -onos_artifacts_uri=file:///stable-images/onos/ -odl_artifacts_cache=/stable-images/odl +onos_release_uri=http://downloads.onosproject.org/release +onos_release_file=onos-1.5.0.tar.gz |