Migrating to Mitaka

[apex.git] / build / opnfv-apex-undercloud.spec

diff --git a/build/opnfv-apex-undercloud.spec b/build/opnfv-apex-undercloud.spec
index 9477551..d8b342e 100644 (file)
--- a/build/opnfv-apex-undercloud.spec
+++ b/build/opnfv-apex-undercloud.spec
@@ -25,52 +25,18 @@ mkdir -p %{buildroot}%{_var}/opt/opnfv/nics/
 
 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/
-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/nics/compute_br-ex.yaml %{buildroot}%{_var}/opt/opnfv/nics/
-install build/nics/compute_private_br-ex.yaml %{buildroot}%{_var}/opt/opnfv/nics/
-install build/nics/compute_storage_br-ex.yaml %{buildroot}%{_var}/opt/opnfv/nics/
-install build/nics/compute_private_storage_br-ex.yaml %{buildroot}%{_var}/opt/opnfv/nics/
-install build/nics/compute_no-public-ip.yaml %{buildroot}%{_var}/opt/opnfv/nics/
-install build/nics/compute_private_no-public-ip.yaml %{buildroot}%{_var}/opt/opnfv/nics/
-install build/nics/compute_storage_no-public-ip.yaml %{buildroot}%{_var}/opt/opnfv/nics/
-install build/nics/compute_private_storage_no-public-ip.yaml %{buildroot}%{_var}/opt/opnfv/nics/
-install build/nics/compute_br-ex_no-public-ip.yaml %{buildroot}%{_var}/opt/opnfv/nics/
-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/nics-controller.yaml.template %{buildroot}%{_var}/opt/opnfv/nics-controller.yaml.template
+install build/nics-compute.yaml.template %{buildroot}%{_var}/opt/opnfv/nics-compute.yaml.template
 
 %files
 %defattr(644, root, root, -)
 %{_var}/opt/opnfv/images/undercloud.qcow2
 %{_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/nics/compute_br-ex.yaml
-%{_var}/opt/opnfv/nics/compute_private_br-ex.yaml
-%{_var}/opt/opnfv/nics/compute_storage_br-ex.yaml
-%{_var}/opt/opnfv/nics/compute_private_storage_br-ex.yaml
-%{_var}/opt/opnfv/nics/compute_no-public-ip.yaml
-%{_var}/opt/opnfv/nics/compute_private_no-public-ip.yaml
-%{_var}/opt/opnfv/nics/compute_storage_no-public-ip.yaml
-%{_var}/opt/opnfv/nics/compute_private_storage_no-public-ip.yaml
-%{_var}/opt/opnfv/nics/compute_br-ex_no-public-ip.yaml
-%{_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/nics-controller.yaml.template
+%{_var}/opt/opnfv/nics-compute.yaml.template
 
 %changelog
+* Wed Mar 30 2016 Dan Radez <dradez@redhat.com> - 2.1-2
+- Replacing NIC files with templates
 * Thu Jan 14 2016 Dan Radez <dradez@redhat.com> - 2.1-1
 - Package Split