diff options
| author |   Feng Pan <fpan@redhat.com> | 2018-04-13 22:22:40 -0400 |
|---|---|---|
| committer |   Tim Rozet <trozet@redhat.com> | 2018-04-19 04:16:11 +0000 |
| commit | d98ecbac0bfbe4157efea5a00836a541ac681b7c (patch) | |
| tree | 996bed129d46aa32ec1d0945849da760fdf95793 /build/rpm_specs/opnfv-apex-common.spec | |
| parent | e5caea32820466d5870f11ba72255b8f77591a62 (diff) | |
Fix nosdn fdio scenario
- Update networking-vpp to use master branch
- Update THT vpp ml2 environment file with correct parameters
- Update external network creation command to use 'externa' as
provider network name.
- Remove vpp network settings file as it's not used
apex-tripleo-heat-templates: Ia25db8456f1ad6beb96c7b9b5f318b166ef4576a
apex-puppet-tripleo: I231054a433eb7e598a6e24f6eaea02d476e776de
Change-Id: I4a1f68c75ae3b7d2a5b347d05abf0d025e8b116b
Signed-off-by: Feng Pan <fpan@redhat.com>
(cherry picked from commit 5acf4e708c68147ef20c67f8d4648e6027c1e20d)
Diffstat (limited to 'build/rpm_specs/opnfv-apex-common.spec')
| -rw-r--r-- | build/rpm_specs/opnfv-apex-common.spec | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/build/rpm_specs/opnfv-apex-common.spec b/build/rpm_specs/opnfv-apex-common.spec index 5d1a59b2..0d12e8d3 100644 --- a/build/rpm_specs/opnfv-apex-common.spec +++ b/build/rpm_specs/opnfv-apex-common.spec @@ -55,7 +55,6 @@ install docs/release/release-notes/release-notes.html %{buildroot}%{_docdir}/opn install config/deploy/deploy_settings.yaml %{buildroot}%{_docdir}/opnfv/deploy_settings.yaml.example install config/network/network_settings.yaml %{buildroot}%{_docdir}/opnfv/network_settings.yaml.example install config/network/network_settings_v6.yaml %{buildroot}%{_docdir}/opnfv/network_settings_v6.yaml.example -install config/network/network_settings_vpp.yaml %{buildroot}%{_docdir}/opnfv/network_settings_vpp.yaml.example install config/inventory/pod_example_settings.yaml %{buildroot}%{_docdir}/opnfv/inventory.yaml.example %files @@ -113,7 +112,6 @@ install config/inventory/pod_example_settings.yaml %{buildroot}%{_docdir}/opnfv/ %{_sysconfdir}/opnfv-apex/network_settings.yaml %{_sysconfdir}/opnfv-apex/network_settings_vlans.yaml %{_sysconfdir}/opnfv-apex/network_settings_v6.yaml -%{_sysconfdir}/opnfv-apex/network_settings_vpp.yaml %doc %{_docdir}/opnfv/LICENSE.rst %doc %{_docdir}/opnfv/installation-instructions.html %doc %{_docdir}/opnfv/release-notes.rst @@ -121,10 +119,11 @@ install config/inventory/pod_example_settings.yaml %{buildroot}%{_docdir}/opnfv/ %doc %{_docdir}/opnfv/deploy_settings.yaml.example %doc %{_docdir}/opnfv/network_settings.yaml.example %doc %{_docdir}/opnfv/network_settings_v6.yaml.example -%doc %{_docdir}/opnfv/network_settings_vpp.yaml.example %doc %{_docdir}/opnfv/inventory.yaml.example %changelog +* Tue Apr 17 2018 Feng Pan <fpan@redhat.com> - 6.0-4 + Removes network_settings_vpp.yaml * Tue Apr 03 2018 Tim Rozet <trozet@redhat.com> - 6.0-3 Adds fetch logs * Fri Mar 09 2018 Tim Rozet <trozet@redhat.com> - 6.0-2 |