summaryrefslogtreecommitdiffstats
path: root/build/rpm_specs/opnfv-apex.spec
diff options
context:
space:
mode:
authorFeng Pan <fpan@redhat.com>2018-05-30 19:56:33 +0000
committerGerrit Code Review <gerrit@opnfv.org>2018-05-30 19:56:33 +0000
commit4f53c4bfc09753c5b3e9d5762d691fc439087295 (patch)
treee9ffe364eba2cc1a89423381077959b4ebd399ca /build/rpm_specs/opnfv-apex.spec
parentf0268bd12aab93870a8f2f322f75ccf3965ca476 (diff)
parentadba3af2572ddfb7d7fd1cfdc3947f6249a0e0eb (diff)
Merge "Updates configs for ODL CSIT deployments"
Diffstat (limited to 'build/rpm_specs/opnfv-apex.spec')
-rw-r--r--build/rpm_specs/opnfv-apex.spec4
1 files changed, 3 insertions, 1 deletions
diff --git a/build/rpm_specs/opnfv-apex.spec b/build/rpm_specs/opnfv-apex.spec
index a718061e..672a28af 100644
--- a/build/rpm_specs/opnfv-apex.spec
+++ b/build/rpm_specs/opnfv-apex.spec
@@ -45,7 +45,6 @@ install build/bash_completion_apex %{buildroot}%{_sysconfdir}/bash_completion.d/
mkdir -p %{buildroot}%{_sysconfdir}/opnfv-apex/
cp -f %{buildroot}%{_datadir}/opnfv-apex/config/deploy/* %{buildroot}%{_sysconfdir}/opnfv-apex/
cp -f %{buildroot}%{_datadir}/opnfv-apex/config/network/* %{buildroot}%{_sysconfdir}/opnfv-apex/
-rm -f %{buildroot}%{_sysconfdir}/opnfv-apex/os-odl-csit-noha.yaml
rm -f %{buildroot}%{_sysconfdir}/opnfv-apex/deploy_settings.yaml
mkdir -p %{buildroot}%{_docdir}/opnfv/
@@ -107,6 +106,7 @@ install config/inventory/pod_example_settings.yaml %{buildroot}%{_docdir}/opnfv/
%{_sysconfdir}/opnfv-apex/os-onos-sfc-ha.yaml
%{_sysconfdir}/opnfv-apex/os-ocl-nofeature-ha.yaml
%{_sysconfdir}/opnfv-apex/network_settings.yaml
+%{_sysconfdir}/opnfv-apex/network_settings_csit.yaml
%{_sysconfdir}/opnfv-apex/network_settings_vlans.yaml
%{_sysconfdir}/opnfv-apex/network_settings_v6.yaml
%doc %{_docdir}/opnfv/LICENSE.rst
@@ -119,6 +119,8 @@ install config/inventory/pod_example_settings.yaml %{buildroot}%{_docdir}/opnfv/
%doc %{_docdir}/opnfv/inventory.yaml.example
%changelog
+* Fri May 25 2018 Tim Rozet <trozet@redhat.com> - 7.0-1
+ Adds CSIT network settings file
* Wed May 02 2018 Tim Rozet <trozet@redhat.com> - 7.0-0
Updates master with new version and deploy settings
* Tue Apr 17 2018 Feng Pan <fpan@redhat.com> - 6.0-4