From 4a22ce42b28e7b6f5d4ef17d70756df169e93e39 Mon Sep 17 00:00:00 2001 From: Dan Radez Date: Mon, 28 Sep 2015 16:26:35 -0400 Subject: Adding deploy.sh that work with RDO Manager - adding virtual and jenkins support tested - adding config file parameters to deploy - instack virt-sparsify disabled for now - adding clean script Change-Id: I26b5968e64fa79af166b11422f5d73812d8e96d1 Signed-off-by: Dan Radez --- build/opnfv-apex.spec | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) (limited to 'build/opnfv-apex.spec') diff --git a/build/opnfv-apex.spec b/build/opnfv-apex.spec index 23d4abc1..b0c1fa5d 100644 --- a/build/opnfv-apex.spec +++ b/build/opnfv-apex.spec @@ -1,5 +1,5 @@ Name: opnfv-apex -Version: 2.0 +Version: 2.1 Release: %{release} Summary: RDO Manager disk images for deployment @@ -25,7 +25,8 @@ to deploy an OpenStack overcloud. %install mkdir -p %{buildroot}%{_bindir}/ -cp ci/deploy.sh %{buildroot}%{_bindir}/ +cp ci/deploy.sh %{buildroot}%{_bindir}/opnfv-deploy +cp ci/clean.sh %{buildroot}%{_bindir}/opnfv-clean mkdir -p %{buildroot}%{_var}/opt/opnfv/stack/ @@ -33,7 +34,8 @@ cp build/instack.qcow2 %{buildroot}%{_var}/opt/opnfv/stack/ cp build/instack.xml %{buildroot}%{_var}/opt/opnfv/ cp build/baremetalbrbm_0.xml %{buildroot}%{_var}/opt/opnfv/ cp build/baremetalbrbm_1.xml %{buildroot}%{_var}/opt/opnfv/ -cp build/brbm.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/instackenv-virt.json %{buildroot}%{_var}/opt/opnfv/ cp build/stack/deploy-ramdisk-ironic.initramfs %{buildroot}%{_var}/opt/opnfv/stack/ @@ -46,12 +48,14 @@ cp build/stack/overcloud-full.qcow2 %{buildroot}%{_var}/opt/opnfv/stack/ cp build/stack/overcloud-full.vmlinuz %{buildroot}%{_var}/opt/opnfv/stack/ %files -%{_bindir}/deploy.sh +%{_bindir}/opnfv-deploy +%{_bindir}/opnfv-clean %{_var}/opt/opnfv/stack/instack.qcow2 %{_var}/opt/opnfv/instack.xml %{_var}/opt/opnfv/baremetalbrbm_0.xml %{_var}/opt/opnfv/baremetalbrbm_1.xml -%{_var}/opt/opnfv/brbm.xml +%{_var}/opt/opnfv/brbm-net.xml +%{_var}/opt/opnfv/default-pool.xml %{_var}/opt/opnfv/instackenv-virt.json %{_var}/opt/opnfv/stack/deploy-ramdisk-ironic.initramfs %{_var}/opt/opnfv/stack/deploy-ramdisk-ironic.kernel @@ -63,6 +67,8 @@ 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 +- Initial deployment success using RPM packaging * Fri Sep 25 2015 Dan Radez - 2.0-1 - Migrated to RDO Manager * Fri Apr 24 2015 Dan Radez - 0.1-1 -- cgit 1.2.3-korg