From f2bddf8acd6f2d702209b1dda74e93afd6b78ff3 Mon Sep 17 00:00:00 2001 From: Dan Radez Date: Wed, 4 Nov 2015 16:13:02 -0500 Subject: adding basic network isolation - separating external traffic from internal traffic JIRA: APEX-41 Change-Id: Idcd01a514083c53a3133a75d3bcabf824a7a4377 --- build/opnfv-apex.spec | 57 ++++++++++++++++++++++++++++++--------------------- 1 file changed, 34 insertions(+), 23 deletions(-) (limited to 'build/opnfv-apex.spec') diff --git a/build/opnfv-apex.spec b/build/opnfv-apex.spec index 9d334a14..29cede8a 100644 --- a/build/opnfv-apex.spec +++ b/build/opnfv-apex.spec @@ -1,5 +1,5 @@ Name: opnfv-apex -Version: 2.1 +Version: 2.2 Release: %{release} Summary: RDO Manager disk images for deployment @@ -25,37 +25,46 @@ to deploy an OpenStack overcloud. %install mkdir -p %{buildroot}%{_bindir}/ -cp ci/deploy.sh %{buildroot}%{_bindir}/opnfv-deploy -cp ci/clean.sh %{buildroot}%{_bindir}/opnfv-clean +install ci/deploy.sh %{buildroot}%{_bindir}/opnfv-deploy +install ci/clean.sh %{buildroot}%{_bindir}/opnfv-clean mkdir -p %{buildroot}%{_var}/opt/opnfv/stack/ +mkdir -p %{buildroot}%{_var}/opt/opnfv/nics/ -cp build/instack.qcow2 %{buildroot}%{_var}/opt/opnfv/stack/ -cp build/instack.xml %{buildroot}%{_var}/opt/opnfv/ -cp build/baremetalbrbm_*.xml %{buildroot}%{_var}/opt/opnfv/ -cp build/brbm-net.xml %{buildroot}%{_var}/opt/opnfv/ -cp build/default-pool.xml %{buildroot}%{_var}/opt/opnfv/ -cp build/opendaylight.yaml %{buildroot}%{_var}/opt/opnfv/ -cp build/opendaylight.patch %{buildroot}%{_var}/opt/opnfv/ +install build/instack.qcow2 %{buildroot}%{_var}/opt/opnfv/stack/ +install build/instack.xml %{buildroot}%{_var}/opt/opnfv/ +install build/baremetalbrbm_brbm1_*.xml %{buildroot}%{_var}/opt/opnfv/ +install build/brbm-net.xml %{buildroot}%{_var}/opt/opnfv/ +install build/brbm1-net.xml %{buildroot}%{_var}/opt/opnfv/ +install build/default-pool.xml %{buildroot}%{_var}/opt/opnfv/ +install build/network-environment.yaml %{buildroot}%{_var}/opt/opnfv/ +install build/nics/controller.yaml %{buildroot}%{_var}/opt/opnfv/nics/ +install build/nics/compute.yaml %{buildroot}%{_var}/opt/opnfv/nics/ +install build/opendaylight.yaml %{buildroot}%{_var}/opt/opnfv/ +install build/opendaylight.patch %{buildroot}%{_var}/opt/opnfv/ -cp build/instackenv-virt.json %{buildroot}%{_var}/opt/opnfv/ -cp build/stack/deploy-ramdisk-ironic.initramfs %{buildroot}%{_var}/opt/opnfv/stack/ -cp build/stack/deploy-ramdisk-ironic.kernel %{buildroot}%{_var}/opt/opnfv/stack/ -cp build/stack/ironic-python-agent.initramfs %{buildroot}%{_var}/opt/opnfv/stack/ -cp build/stack/ironic-python-agent.kernel %{buildroot}%{_var}/opt/opnfv/stack/ -cp build/stack/ironic-python-agent.vmlinuz %{buildroot}%{_var}/opt/opnfv/stack/ -cp build/stack/overcloud-full.initrd %{buildroot}%{_var}/opt/opnfv/stack/ -cp build/stack/overcloud-full.qcow2 %{buildroot}%{_var}/opt/opnfv/stack/ -cp build/stack/overcloud-full.vmlinuz %{buildroot}%{_var}/opt/opnfv/stack/ +install build/instackenv-virt.json %{buildroot}%{_var}/opt/opnfv/ +install build/stack/deploy-ramdisk-ironic.initramfs %{buildroot}%{_var}/opt/opnfv/stack/ +install build/stack/deploy-ramdisk-ironic.kernel %{buildroot}%{_var}/opt/opnfv/stack/ +install build/stack/ironic-python-agent.initramfs %{buildroot}%{_var}/opt/opnfv/stack/ +install build/stack/ironic-python-agent.kernel %{buildroot}%{_var}/opt/opnfv/stack/ +install build/stack/ironic-python-agent.vmlinuz %{buildroot}%{_var}/opt/opnfv/stack/ +install build/stack/overcloud-full.initrd %{buildroot}%{_var}/opt/opnfv/stack/ +install build/stack/overcloud-full.qcow2 %{buildroot}%{_var}/opt/opnfv/stack/ +install build/stack/overcloud-full.vmlinuz %{buildroot}%{_var}/opt/opnfv/stack/ %files %{_bindir}/opnfv-deploy %{_bindir}/opnfv-clean %{_var}/opt/opnfv/stack/instack.qcow2 %{_var}/opt/opnfv/instack.xml -%{_var}/opt/opnfv/baremetalbrbm_*.xml +%{_var}/opt/opnfv/baremetalbrbm_brbm1_*.xml %{_var}/opt/opnfv/brbm-net.xml +%{_var}/opt/opnfv/brbm1-net.xml %{_var}/opt/opnfv/default-pool.xml +%{_var}/opt/opnfv/network-environment.yaml +%{_var}/opt/opnfv/nics/controller.yaml +%{_var}/opt/opnfv/nics/compute.yaml %{_var}/opt/opnfv/opendaylight.yaml %{_var}/opt/opnfv/opendaylight.patch %{_var}/opt/opnfv/instackenv-virt.json @@ -69,9 +78,11 @@ cp build/stack/overcloud-full.vmlinuz %{buildroot}%{_var}/opt/opnfv/stack/ %{_var}/opt/opnfv/stack/overcloud-full.vmlinuz %changelog -* Wed Oct 21 2015 Dan Radez - 2.1-1 +* Thu Nov 12 2015 Dan Radez - 2.2-1 +- OpenDaylight and Network Isolation support +* Wed Oct 21 2015 Dan Radez - 2.1-1 - Initial deployment success using RPM packaging -* Fri Sep 25 2015 Dan Radez - 2.0-1 +* Fri Sep 25 2015 Dan Radez - 2.0-1 - Migrated to RDO Manager -* Fri Apr 24 2015 Dan Radez - 0.1-1 +* Fri Apr 24 2015 Dan Radez - 0.1-1 - Initial Packaging -- cgit 1.2.3-korg