X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=build%2Fopnfv-apex-undercloud.spec;h=9477551b175fd759ebd93d870063c0a1c6f76799;hb=53003f9fef6b49304f37e5fbb5d15bc4f1316948;hp=8d585db2ed076c2eed4566070f5ec8da650105d4;hpb=6eaef72d9b3de5a7c17a6a03529bbd735890b830;p=apex.git

diff --git a/build/opnfv-apex-undercloud.spec b/build/opnfv-apex-undercloud.spec
index 8d585db2..9477551b 100644
--- a/build/opnfv-apex-undercloud.spec
+++ b/build/opnfv-apex-undercloud.spec
@@ -1,7 +1,7 @@
 Name:		opnfv-apex-undercloud
 Version:	2.1
 Release:	%{release}
-Summary:	Scripts and Disk images to launch Instack Undercloud for OPNFV Apex
+Summary:	Scripts and Disk images to launch the Undercloud for OPNFV Apex
 
 Group:		System Environment
 License:	Apache 2.0
@@ -13,24 +13,17 @@ BuildRequires:	openvswitch libvirt qemu-kvm python-docutils
 Requires:	openvswitch libvirt qemu-kvm bridge-utils libguestfs-tools
 
 %description
-Scripts and Disk images to launch Instack Undercloud for OPNFV Apex
+Scripts and Disk images to launch the Undercloud for OPNFV Apex
 https://wiki.opnfv.org/apex
 
 %prep
 %setup -q
 
 %install
-mkdir -p %{buildroot}%{_var}/opt/opnfv/stack/
+mkdir -p %{buildroot}%{_var}/opt/opnfv/images/
 mkdir -p %{buildroot}%{_var}/opt/opnfv/nics/
 
-install build/instack.qcow2 %{buildroot}%{_var}/opt/opnfv/stack/
-install build/instack.xml %{buildroot}%{_var}/opt/opnfv/
-install build/baremetalbrbm_brbm1_brbm2_brbm3_*.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/brbm2-net.xml %{buildroot}%{_var}/opt/opnfv/
-install build/brbm3-net.xml %{buildroot}%{_var}/opt/opnfv/
-install build/default-pool.xml %{buildroot}%{_var}/opt/opnfv/
+install build/undercloud.qcow2 %{buildroot}%{_var}/opt/opnfv/images/
 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/
@@ -52,19 +45,10 @@ install build/nics/compute_br-ex_no-public-ip.yaml %{buildroot}%{_var}/opt/opnfv
 install build/nics/compute_private_br-ex_no-public-ip.yaml %{buildroot}%{_var}/opt/opnfv/nics/
 install build/nics/compute_storage_br-ex_no-public-ip.yaml %{buildroot}%{_var}/opt/opnfv/nics/
 install build/nics/compute_private_storage_br-ex_no-public-ip.yaml %{buildroot}%{_var}/opt/opnfv/nics/
-install build/instackenv-virt.json %{buildroot}%{_var}/opt/opnfv/
-install build/instackenv.json.example %{buildroot}%{_var}/opt/opnfv/
 
 %files
 %defattr(644, root, root, -)
-%{_var}/opt/opnfv/stack/instack.qcow2
-%{_var}/opt/opnfv/instack.xml
-%{_var}/opt/opnfv/baremetalbrbm_brbm1_brbm2_brbm3_*.xml
-%{_var}/opt/opnfv/brbm-net.xml
-%{_var}/opt/opnfv/brbm1-net.xml
-%{_var}/opt/opnfv/brbm2-net.xml
-%{_var}/opt/opnfv/brbm3-net.xml
-%{_var}/opt/opnfv/default-pool.xml
+%{_var}/opt/opnfv/images/undercloud.qcow2
 %{_var}/opt/opnfv/network-environment.yaml
 %{_var}/opt/opnfv/nics/controller.yaml
 %{_var}/opt/opnfv/nics/compute.yaml
@@ -86,8 +70,6 @@ install build/instackenv.json.example %{buildroot}%{_var}/opt/opnfv/
 %{_var}/opt/opnfv/nics/compute_private_br-ex_no-public-ip.yaml
 %{_var}/opt/opnfv/nics/compute_storage_br-ex_no-public-ip.yaml
 %{_var}/opt/opnfv/nics/compute_private_storage_br-ex_no-public-ip.yaml
-%{_var}/opt/opnfv/instackenv-virt.json
-%{_var}/opt/opnfv/instackenv.json.example
 
 %changelog
 * Thu Jan 14 2016 Dan Radez <dradez@redhat.com> - 2.1-1