diff options
| author |   Tim Rozet <trozet@redhat.com> | 2018-08-13 14:51:09 -0400 |
|---|---|---|
| committer | Tim Rozet <trozet@redhat.com> | 2018-08-14 15:38:59 -0400 |
| commit | ae5fcc0dd1d19c750cba8d9bf16545f5a7802287 (patch) | |
| tree | 8bd9601966ded90b63373ccaa3ac3993d21beffa /build | |
| parent | c5959cc14b95e9d10b78ebf3c8e2525c672fc0c7 (diff) | |
Allow common patches file
This patch adds allowing for common patches that should be applied to
every scenario to be included. It by default pulls in a file in the
deploy directory 'common-patches.yaml', but can optionally be
overridden.
This patch also includes a patch upstream to fix OSCLI not working
anymore due to breakage with the Cinder version in the overcloudrc.
Change-Id: I97b9efb937deff07e085b9ef75b9799fb65bfc57
Signed-off-by: Tim Rozet <trozet@redhat.com>
Diffstat (limited to 'build')
| -rw-r--r-- | build/rpm_specs/opnfv-apex.spec | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/build/rpm_specs/opnfv-apex.spec b/build/rpm_specs/opnfv-apex.spec index c344dfda..0f6f1f84 100644 --- a/build/rpm_specs/opnfv-apex.spec +++ b/build/rpm_specs/opnfv-apex.spec @@ -67,6 +67,7 @@ install config/inventory/pod_example_settings.yaml %{buildroot}%{_docdir}/opnfv/ %attr(755,root,root) %{_bindir}/opnfv-pyutil %{_datadir}/opnfv-apex/ %{_sysconfdir}/bash_completion.d/apex +%{_sysconfdir}/opnfv-apex/common-patches.yaml %{_sysconfdir}/opnfv-apex/os-nosdn-nofeature-noha.yaml %{_sysconfdir}/opnfv-apex/os-nosdn-bar-noha.yaml %{_sysconfdir}/opnfv-apex/os-nosdn-bar-ha.yaml @@ -125,7 +126,9 @@ install config/inventory/pod_example_settings.yaml %{buildroot}%{_docdir}/opnfv/ %doc %{_docdir}/opnfv/inventory.yaml.example %changelog -* Wed Jun 27 2018 Feng Pan <fpan@redhat.com> -7.0-4 +* Tue Aug 14 2018 Tim Rozet <trozet@redhat.com> - 7.0-5 + Adds common patches file +* Wed Jun 27 2018 Feng Pan <fpan@redhat.com> - 7.0-4 Adds network_settings_tenant_vlan.yaml * Wed Jun 20 2018 Zenghui Shi <zshi@redhat.com> - 7.0-3 Adds Kubernetes deployment scenario |