diff options
| author |   Tim Rozet <trozet@redhat.com> | 2016-05-24 17:14:36 -0400 |
|---|---|---|
| committer | Tim Rozet <trozet@redhat.com> | 2016-05-25 14:05:26 -0400 |
| commit | 2370aea5cb854569722897dcb37341841842e873 (patch) | |
| tree | 73e9d45fe2c5115bf2a701d9f2a63ee7ef7923a4 /build | |
| parent | 5fec80057dbd799d52a4c1ff2f35a1c8cc5ad6ea (diff) | |
Fixes nic template missing in spec and error catching
Issue where jinja 2 templates were missing from spec file. Also adds
error checking to make sure the nic templates were correctly generated.
There was an error with dependencies missing on the build server - this
patch includes a fix to make sure it is installed before trying to make.
Change-Id: I7989ccf297a4e0d81326cccc06b2132018e7d8ae
Signed-off-by: Tim Rozet <trozet@redhat.com>
Diffstat (limited to 'build')
| -rw-r--r-- | build/opnfv-apex-undercloud.spec | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/build/opnfv-apex-undercloud.spec b/build/opnfv-apex-undercloud.spec index ae72485f..0e4798b3 100644 --- a/build/opnfv-apex-undercloud.spec +++ b/build/opnfv-apex-undercloud.spec @@ -27,6 +27,8 @@ install build/undercloud.qcow2 %{buildroot}%{_var}/opt/opnfv/images/ install build/network-environment.yaml %{buildroot}%{_var}/opt/opnfv/ 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 +install build/nics-controller.yaml.template %{buildroot}%{_var}/opt/opnfv/nics-controller.yaml.jinja2 +install build/nics-compute.yaml.template %{buildroot}%{_var}/opt/opnfv/nics-compute.yaml.jinja2 %files %defattr(644, root, root, -) @@ -34,8 +36,13 @@ install build/nics-compute.yaml.template %{buildroot}%{_var}/opt/opnfv/nics-comp %{_var}/opt/opnfv/network-environment.yaml %{_var}/opt/opnfv/nics-controller.yaml.template %{_var}/opt/opnfv/nics-compute.yaml.template +%{_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 |