Change keystone CLI to OSC

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

diff --git a/build/opnfv-apex-undercloud.spec b/build/opnfv-apex-undercloud.spec
index 9477551..55e152f 100644 (file)
--- a/build/opnfv-apex-undercloud.spec
+++ b/build/opnfv-apex-undercloud.spec
@@ -1,5 +1,5 @@
 Name:          opnfv-apex-undercloud
-Version:       2.1
+Version:       3.0
 Release:       %{release}
 Summary:       Scripts and Disk images to launch the Undercloud for OPNFV Apex
 
@@ -25,52 +25,23 @@ 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.jinja2 %{buildroot}%{_var}/opt/opnfv/
+install build/nics-compute.yaml.jinja2 %{buildroot}%{_var}/opt/opnfv/
 
 %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.jinja2
+%{_var}/opt/opnfv/nics-compute.yaml.jinja2
+
 
 %changelog
+* Thu May 24 2016 Tim Rozet <trozet@redhat.com> - 3.0-1
+- Adds jinja2 nic templates
+* Mon Apr 04 2016 Dan Radez <dradez@redhat.com> - 3.0-0
+- Version update for Colorado
+* 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