From 90c5cf6da143cfe4f50eace12251934ebd29a239 Mon Sep 17 00:00:00 2001 From: Dan Radez Date: Mon, 11 Jan 2016 15:07:04 -0500 Subject: splitting rpm into multiple rpms - code in the common rpm - instack in the instack rpm - undercloud in an rpm that will be named per sdn in the future Change-Id: I969277daf87f67da6934cad7268c96efda6960c7 --- build/Makefile | 59 +++++++++++++++++++-------- build/opnfv-apex-common.spec | 64 +++++++++++++++++++++++++++++ build/opnfv-apex-undercloud.spec | 70 ++++++++++++++++++++++++++++++++ build/opnfv-apex.spec | 87 +++++----------------------------------- 4 files changed, 186 insertions(+), 94 deletions(-) create mode 100644 build/opnfv-apex-common.spec create mode 100644 build/opnfv-apex-undercloud.spec diff --git a/build/Makefile b/build/Makefile index f1341fbe..f55d3e7a 100644 --- a/build/Makefile +++ b/build/Makefile @@ -24,6 +24,8 @@ export PRODNO = "OPNFV_BGS" export REVSTATE = "0000" export NEWISO = $(shell pwd)/release/OPNFV-CentOS-7-x86_64-${REVSTATE}.iso export RPMVERS = $(shell grep Version $(shell pwd)/opnfv-apex.spec | awk '{ print $$2 }') +export APEXRPMCOM = $(shell pwd)/noarch/opnfv-apex-common-$(RPMVERS)-$(shell echo ${REVSTATE} | tr -d '_-').noarch.rpm +export APEXRPMINS = $(shell pwd)/noarch/opnfv-apex-undercloud-$(RPMVERS)-$(shell echo ${REVSTATE} | tr -d '_-').noarch.rpm export APEXRPM = $(shell pwd)/noarch/opnfv-apex-$(RPMVERS)-$(shell echo ${REVSTATE} | tr -d '_-').noarch.rpm # Note! Invoke with "make REVSTATE=RXXXX all" to make release build! @@ -94,26 +96,49 @@ $(SUBCLEAN): %.clean: .PHONY: rpm-clean rpm-clean: + @rm -f build/opnfv-apex-common.tar.gz + @rm -f build/opnfv-apex-undercloud.tar.gz @rm -f build/opnfv-apex.tar.gz .PHONY: rpm rpm: - pushd ../ && git archive --format=tar --prefix=opnfv-apex-$(RPMVERS)/ HEAD > build/opnfv-apex.tar - tar -u --xform="s:stack/instack.qcow2:opnfv-apex-$(RPMVERS)/build/instack.qcow2:" --file=opnfv-apex.tar stack/instack.qcow2 - tar -u --xform="s:instack.xml:opnfv-apex-$(RPMVERS)/build/instack.xml:" --file=opnfv-apex.tar instack.xml - tar -u --xform="s:baremetalbrbm_brbm1_brbm2_brbm3_0.xml:opnfv-apex-$(RPMVERS)/build/baremetalbrbm_brbm1_brbm2_brbm3_0.xml:" --file=opnfv-apex.tar baremetalbrbm_brbm1_brbm2_brbm3_0.xml - tar -u --xform="s:baremetalbrbm_brbm1_brbm2_brbm3_1.xml:opnfv-apex-$(RPMVERS)/build/baremetalbrbm_brbm1_brbm2_brbm3_1.xml:" --file=opnfv-apex.tar baremetalbrbm_brbm1_brbm2_brbm3_1.xml - tar -u --xform="s:baremetalbrbm_brbm1_brbm2_brbm3_2.xml:opnfv-apex-$(RPMVERS)/build/baremetalbrbm_brbm1_brbm2_brbm3_2.xml:" --file=opnfv-apex.tar baremetalbrbm_brbm1_brbm2_brbm3_2.xml - tar -u --xform="s:baremetalbrbm_brbm1_brbm2_brbm3_3.xml:opnfv-apex-$(RPMVERS)/build/baremetalbrbm_brbm1_brbm2_brbm3_3.xml:" --file=opnfv-apex.tar baremetalbrbm_brbm1_brbm2_brbm3_3.xml - tar -u --xform="s:baremetalbrbm_brbm1_brbm2_brbm3_4.xml:opnfv-apex-$(RPMVERS)/build/baremetalbrbm_brbm1_brbm2_brbm3_4.xml:" --file=opnfv-apex.tar baremetalbrbm_brbm1_brbm2_brbm3_4.xml - tar -u --xform="s:brbm-net.xml:opnfv-apex-$(RPMVERS)/build/brbm-net.xml:" --file=opnfv-apex.tar brbm-net.xml - tar -u --xform="s:brbm1-net.xml:opnfv-apex-$(RPMVERS)/build/brbm1-net.xml:" --file=opnfv-apex.tar brbm1-net.xml - tar -u --xform="s:brbm2-net.xml:opnfv-apex-$(RPMVERS)/build/brbm2-net.xml:" --file=opnfv-apex.tar brbm2-net.xml - tar -u --xform="s:brbm3-net.xml:opnfv-apex-$(RPMVERS)/build/brbm3-net.xml:" --file=opnfv-apex.tar brbm3-net.xml - tar -u --xform="s:default-pool.xml:opnfv-apex-$(RPMVERS)/build/default-pool.xml:" --file=opnfv-apex.tar default-pool.xml - tar -u --xform="s:instackenv-virt.json:opnfv-apex-$(RPMVERS)/build/instackenv-virt.json:" --file=opnfv-apex.tar instackenv-virt.json - tar -u --xform="s:stack/overcloud-full-odl.qcow2:opnfv-apex-$(RPMVERS)/build/stack/overcloud-full.qcow2:" --file=opnfv-apex.tar stack/overcloud-full-odl.qcow2 - gzip -f opnfv-apex.tar + # build the common RPM + pushd ../ && git archive --format=tar.gz --prefix=opnfv-apex-common-$(RPMVERS)/ HEAD > build/opnfv-apex-common.tar.gz + rpmbuild -ba opnfv-apex-common.spec -D '_topdir %(echo `pwd`)' -D '_builddir %(echo `pwd`)' -D '_sourcedir %(echo `pwd`)' -D '_rpmdir %(echo `pwd`)' -D '_specdir %(echo `pwd`)' -D '_srcrpmdir %(echo `pwd`)' -D "release $(shell echo $(REVSTATE) | tr -d '_-')" + # build the undercloud RPM + tar -czf opnfv-apex-undercloud.tar.gz \ + --xform="s:stack/instack.qcow2:opnfv-apex-undercloud-$(RPMVERS)/build/instack.qcow2:" \ + --xform="s:instack.xml:opnfv-apex-undercloud-$(RPMVERS)/build/instack.xml:" \ + --xform="s:baremetalbrbm_brbm1_brbm2_brbm3_0.xml:opnfv-apex-undercloud-$(RPMVERS)/build/baremetalbrbm_brbm1_brbm2_brbm3_0.xml:" \ + --xform="s:baremetalbrbm_brbm1_brbm2_brbm3_1.xml:opnfv-apex-undercloud-$(RPMVERS)/build/baremetalbrbm_brbm1_brbm2_brbm3_1.xml:" \ + --xform="s:baremetalbrbm_brbm1_brbm2_brbm3_2.xml:opnfv-apex-undercloud-$(RPMVERS)/build/baremetalbrbm_brbm1_brbm2_brbm3_2.xml:" \ + --xform="s:baremetalbrbm_brbm1_brbm2_brbm3_3.xml:opnfv-apex-undercloud-$(RPMVERS)/build/baremetalbrbm_brbm1_brbm2_brbm3_3.xml:" \ + --xform="s:baremetalbrbm_brbm1_brbm2_brbm3_4.xml:opnfv-apex-undercloud-$(RPMVERS)/build/baremetalbrbm_brbm1_brbm2_brbm3_4.xml:" \ + --xform="s:brbm-net.xml:opnfv-apex-undercloud-$(RPMVERS)/build/brbm-net.xml:" \ + --xform="s:brbm1-net.xml:opnfv-apex-undercloud-$(RPMVERS)/build/brbm1-net.xml:" \ + --xform="s:brbm2-net.xml:opnfv-apex-undercloud-$(RPMVERS)/build/brbm2-net.xml:" \ + --xform="s:brbm3-net.xml:opnfv-apex-undercloud-$(RPMVERS)/build/brbm3-net.xml:" \ + --xform="s:default-pool.xml:opnfv-apex-undercloud-$(RPMVERS)/build/default-pool.xml:" \ + --xform="s:network-environment.yaml:opnfv-apex-undercloud-$(RPMVERS)/build/network-environment.yaml:" \ + --xform="s:nics/controller.yaml:opnfv-apex-undercloud-$(RPMVERS)/build/nics/controller.yaml:" \ + --xform="s:nics/compute.yaml:opnfv-apex-undercloud-$(RPMVERS)/build/nics/compute.yaml:" \ + --xform="s:nics/controller_private.yaml:opnfv-apex-undercloud-$(RPMVERS)/build/nics/controller_private.yaml:" \ + --xform="s:nics/compute_private.yaml:opnfv-apex-undercloud-$(RPMVERS)/build/nics/compute_private.yaml:" \ + --xform="s:nics/controller_storage.yaml:opnfv-apex-undercloud-$(RPMVERS)/build/nics/controller_storage.yaml:" \ + --xform="s:nics/compute_storage.yaml:opnfv-apex-undercloud-$(RPMVERS)/build/nics/compute_storage.yaml:" \ + --xform="s:nics/controller_private_storage.yaml:opnfv-apex-undercloud-$(RPMVERS)/build/nics/controller_private_storage.yaml:" \ + --xform="s:nics/compute_private_storage.yaml:opnfv-apex-undercloud-$(RPMVERS)/build/nics/compute_private_storage.yaml:" \ + --xform="s:instackenv-virt.json:opnfv-apex-undercloud-$(RPMVERS)/build/instackenv-virt.json:" \ + --xform="s:instackenv.json.example:opnfv-apex-undercloud-$(RPMVERS)/build/instackenv.json.example:" \ + stack/instack.qcow2 instack.xml baremetalbrbm_brbm1_brbm2_brbm3_0.xml baremetalbrbm_brbm1_brbm2_brbm3_1.xml \ + baremetalbrbm_brbm1_brbm2_brbm3_2.xml baremetalbrbm_brbm1_brbm2_brbm3_3.xml baremetalbrbm_brbm1_brbm2_brbm3_4.xml \ + brbm-net.xml brbm1-net.xml brbm2-net.xml brbm3-net.xml default-pool.xml instackenv-virt.json network-environment.yaml \ + nics/controller.yaml nics/compute.yaml nics/controller_private.yaml nics/compute_private.yaml \ + nics/controller_storage.yaml nics/compute_storage.yaml nics/controller_private_storage.yaml \ + nics/compute_private_storage.yaml instackenv-virt.json instackenv.json.example + rpmbuild -ba opnfv-apex-undercloud.spec -D '_topdir %(echo `pwd`)' -D '_builddir %(echo `pwd`)' -D '_sourcedir %(echo `pwd`)' -D '_rpmdir %(echo `pwd`)' -D '_specdir %(echo `pwd`)' -D '_srcrpmdir %(echo `pwd`)' -D "release $(shell echo $(REVSTATE) | tr -d '_-')" + # build the overcloud RPM + tar -czf opnfv-apex.tar.gz --xform="s:stack/overcloud-full-odl.qcow2:opnfv-apex-$(RPMVERS)/build/stack/overcloud-full.qcow2:" stack/overcloud-full-odl.qcow2 rpmbuild -ba opnfv-apex.spec -D '_topdir %(echo `pwd`)' -D '_builddir %(echo `pwd`)' -D '_sourcedir %(echo `pwd`)' -D '_rpmdir %(echo `pwd`)' -D '_specdir %(echo `pwd`)' -D '_srcrpmdir %(echo `pwd`)' -D "release $(shell echo $(REVSTATE) | tr -d '_-')" .PHONY: instack @@ -136,6 +161,8 @@ iso: build-clean instack rpm $(ISOCACHE) cd centos && bsdtar -xf ../$(shell basename $(ISOSRC)) # modify the installer iso's contents @cp -f isolinux.cfg centos/isolinux/isolinux.cfg + @cp $(APEXRPMCOM) centos/Packages + @cp $(APEXRPMINS) centos/Packages @cp $(APEXRPM) centos/Packages cd centos/Packages && yumdownloader openvswitch # regenerate yum repo data diff --git a/build/opnfv-apex-common.spec b/build/opnfv-apex-common.spec new file mode 100644 index 00000000..15fd9e1f --- /dev/null +++ b/build/opnfv-apex-common.spec @@ -0,0 +1,64 @@ +Name: opnfv-apex-common +Version: 2.1 +Release: %{release} +Summary: Scripts for OPNFV deployment using RDO Manager + +Group: System Environment +License: Apache 2.0 +URL: https://gerrit.opnfv.org/gerrit/apex.git +Source0: opnfv-apex-common.tar.gz + +BuildArch: noarch +BuildRequires: openvswitch qemu-kvm python-docutils +Requires: opnfv-apex-sdn opnfv-apex-undercloud openvswitch qemu-kvm bridge-utils libguestfs-tools + +%description +Scripts for OPNFV deployment using RDO Manager +https://wiki.opnfv.org/apex + +%prep +%setup -q + +%build +rst2html docs/installation-instructions/installation-instructions.rst docs/installation-instructions.html +rst2html docs/release-notes/release-notes.rst docs/release-notes.html + +%install +mkdir -p %{buildroot}%{_bindir}/ +install ci/deploy.sh %{buildroot}%{_bindir}/opnfv-deploy +install ci/clean.sh %{buildroot}%{_bindir}/opnfv-clean + +mkdir -p %{buildroot}%{_sysconfdir}/opnfv-apex/ +install config/deploy/deploy_settings.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/deploy_settings.yaml +install config/deploy/network/network_settings.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/network_settings.yaml + +mkdir -p %{buildroot}%{_var}/opt/opnfv/lib/ +install lib/common-functions.sh %{buildroot}%{_var}/opt/opnfv/lib/ + +mkdir -p %{buildroot}%{_docdir}/opnfv/ +install LICENSE.rst %{buildroot}%{_docdir}/opnfv/ +install docs/installation-instructions/index.rst %{buildroot}%{_docdir}/opnfv/installation-instructions.rst +install docs/installation-instructions.html %{buildroot}%{_docdir}/opnfv/ +install docs/release-notes/index.rst %{buildroot}%{_docdir}/opnfv/release-notes.rst +install docs/release-notes.html %{buildroot}%{_docdir}/opnfv/ +install config/deploy/deploy_settings.yaml %{buildroot}%{_docdir}/opnfv/deploy_settings.yaml.example +install config/deploy/network/network_settings.yaml %{buildroot}%{_docdir}/opnfv/network_settings.yaml.example + +%files +%defattr(644, root, root, -) +%attr(755,root,root) %{_bindir}/opnfv-deploy +%attr(755,root,root) %{_bindir}/opnfv-clean +%{_var}/opt/opnfv/lib/common-functions.sh +%{_sysconfdir}/opnfv-apex/deploy_settings.yaml +%{_sysconfdir}/opnfv-apex/network_settings.yaml +%doc %{_docdir}/opnfv/LICENSE.rst +%doc %{_docdir}/opnfv/installation-instructions.rst +%doc %{_docdir}/opnfv/installation-instructions.html +%doc %{_docdir}/opnfv/release-notes.rst +%doc %{_docdir}/opnfv/release-notes.html +%doc %{_docdir}/opnfv/deploy_settings.yaml.example +%doc %{_docdir}/opnfv/network_settings.yaml.example + +%changelog +* Thu Jan 14 2016 Dan Radez - 2.1-2 +- Package Split diff --git a/build/opnfv-apex-undercloud.spec b/build/opnfv-apex-undercloud.spec new file mode 100644 index 00000000..e18ea8f1 --- /dev/null +++ b/build/opnfv-apex-undercloud.spec @@ -0,0 +1,70 @@ +Name: opnfv-apex-undercloud +Version: 2.1 +Release: %{release} +Summary: Scripts and Disk images to launch Instack Undercloud for OPNFV Apex + +Group: System Environment +License: Apache 2.0 +URL: https://gerrit.opnfv.org/gerrit/apex.git +Source0: opnfv-apex-undercloud.tar.gz + +BuildArch: noarch +BuildRequires: openvswitch qemu-kvm python-docutils +Requires: openvswitch qemu-kvm bridge-utils libguestfs-tools + +%description +Scripts and Disk images to launch Instack 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/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/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/nics/controller_private.yaml %{buildroot}%{_var}/opt/opnfv/nics/ +install build/nics/compute_private.yaml %{buildroot}%{_var}/opt/opnfv/nics/ +install build/nics/controller_storage.yaml %{buildroot}%{_var}/opt/opnfv/nics/ +install build/nics/compute_storage.yaml %{buildroot}%{_var}/opt/opnfv/nics/ +install build/nics/controller_private_storage.yaml %{buildroot}%{_var}/opt/opnfv/nics/ +install build/nics/compute_private_storage.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/network-environment.yaml +%{_var}/opt/opnfv/nics/controller.yaml +%{_var}/opt/opnfv/nics/compute.yaml +%{_var}/opt/opnfv/nics/controller_private.yaml +%{_var}/opt/opnfv/nics/compute_private.yaml +%{_var}/opt/opnfv/nics/controller_storage.yaml +%{_var}/opt/opnfv/nics/compute_storage.yaml +%{_var}/opt/opnfv/nics/controller_private_storage.yaml +%{_var}/opt/opnfv/nics/compute_private_storage.yaml +%{_var}/opt/opnfv/instackenv-virt.json +%{_var}/opt/opnfv/instackenv.json.example + +%changelog +* Thu Jan 14 2016 Dan Radez - 2.1-1 +- Package Split diff --git a/build/opnfv-apex.spec b/build/opnfv-apex.spec index e2ae7181..ebe87897 100644 --- a/build/opnfv-apex.spec +++ b/build/opnfv-apex.spec @@ -1,105 +1,36 @@ Name: opnfv-apex Version: 2.1 Release: %{release} -Summary: Scripts and Disk images for deployment +Summary: Overcloud Disk images for OPNFV Apex OpenDaylight deployment Group: System Environment License: Apache 2.0 URL: https://gerrit.opnfv.org/gerrit/apex.git Source0: opnfv-apex.tar.gz +Provides: opnfv-apex-sdn BuildArch: noarch -BuildRequires: openvswitch qemu-kvm python-docutils -Requires: openvswitch qemu-kvm bridge-utils libguestfs-tools +Requires: opnfv-apex-common opnfv-apex-undercloud +Conflicts: opnfv-apex-onos opnfv-apex-opencontrail %description -These files are scripts and disk images used to launch the instack -libvirt VM and to load into the instack undercloud machine -to deploy an OpenStack overcloud. Installation is done via RDO Manager -https://rdoproject.org +Overcloud Disk images for OPNFV Apex OpenDaylight deployment +https://wiki.opnfv.org/apex %prep %setup -q - -%build -rst2html docs/installation-instructions/installation-instructions.rst docs/installation-instructions.html -rst2html docs/release-notes/index.rst docs/release-notes.html - %install -mkdir -p %{buildroot}%{_bindir}/ -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/ -mkdir -p %{buildroot}%{_var}/opt/opnfv/lib/ - -install lib/common-functions.sh %{buildroot}%{_var}/opt/opnfv/lib/ -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/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/nics/controller_private.yaml %{buildroot}%{_var}/opt/opnfv/nics/ -install build/nics/compute_private.yaml %{buildroot}%{_var}/opt/opnfv/nics/ -install build/nics/controller_storage.yaml %{buildroot}%{_var}/opt/opnfv/nics/ -install build/nics/compute_storage.yaml %{buildroot}%{_var}/opt/opnfv/nics/ -install build/nics/controller_private_storage.yaml %{buildroot}%{_var}/opt/opnfv/nics/ -install build/nics/compute_private_storage.yaml %{buildroot}%{_var}/opt/opnfv/nics/ - -install build/instackenv-virt.json %{buildroot}%{_var}/opt/opnfv/ -install build/instackenv.json.example %{buildroot}%{_var}/opt/opnfv/ install build/stack/overcloud-full.qcow2 %{buildroot}%{_var}/opt/opnfv/stack/ -mkdir -p %{buildroot}%{_docdir}/opnfv/ -install LICENSE.rst %{buildroot}%{_docdir}/opnfv/ -install docs/installation-instructions/index.rst %{buildroot}%{_docdir}/opnfv/installation-instructions.rst -install docs/installation-instructions.html %{buildroot}%{_docdir}/opnfv/ -install docs/release-notes/index.rst %{buildroot}%{_docdir}/opnfv/release-notes.rst -install docs/release-notes.html %{buildroot}%{_docdir}/opnfv/ -install config/deploy/deploy_settings.yaml %{buildroot}%{_docdir}/opnfv/deploy_settings.yaml.example -install config/deploy/network/network_settings.yaml %{buildroot}%{_docdir}/opnfv/network_settings.yaml.example - %files -%{_bindir}/opnfv-deploy -%{_bindir}/opnfv-clean -%{_var}/opt/opnfv/lib/common-functions.sh -%{_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/network-environment.yaml -%{_var}/opt/opnfv/nics/controller.yaml -%{_var}/opt/opnfv/nics/compute.yaml -%{_var}/opt/opnfv/nics/controller_private.yaml -%{_var}/opt/opnfv/nics/compute_private.yaml -%{_var}/opt/opnfv/nics/controller_storage.yaml -%{_var}/opt/opnfv/nics/compute_storage.yaml -%{_var}/opt/opnfv/nics/controller_private_storage.yaml -%{_var}/opt/opnfv/nics/compute_private_storage.yaml -%{_var}/opt/opnfv/instackenv-virt.json -%{_var}/opt/opnfv/instackenv.json.example +%defattr(644, root, root, -) %{_var}/opt/opnfv/stack/overcloud-full.qcow2 -%doc %{_docdir}/opnfv/LICENSE.rst -%doc %{_docdir}/opnfv/installation-instructions.rst -%doc %{_docdir}/opnfv/installation-instructions.html -%doc %{_docdir}/opnfv/release-notes.rst -%doc %{_docdir}/opnfv/release-notes.html -%doc %{_docdir}/opnfv/deploy_settings.yaml.example -%doc %{_docdir}/opnfv/network_settings.yaml.example %changelog +* Thu Jan 14 2016 Dan Radez - 2.1-2 +- Package Split * Wed Jan 13 2016 Dan Radez - 2.1-1 - Incrementing Minor for Bramaputra RC release * Sun Dec 20 2015 Tim Rozet - 2.0-8 -- cgit 1.2.3-korg