diff options
| author |   Tim Rozet <trozet@redhat.com> | 2016-08-03 19:23:14 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-08-03 19:23:14 +0000 |
| commit | 2912d5cf3ce7f160a33d0ba1fb681c5cbae33944 (patch) | |
| tree | f8beda78de9053794a92e085c3df088f0db4dff2 /build | |
| parent | 80783b3b94f3f1dba94bcb15d43be311e157120e (diff) | |
| parent | 0cf5b3770e33ed1168e98d557a6dc212ca57f970 (diff) | |
Merge "Adds configuring vpp/hc on all nodes"
Diffstat (limited to 'build')
| -rw-r--r-- | build/build_perf_image.sh | 2 | ||||
| -rw-r--r-- | build/network-environment.yaml | 1 | ||||
| -rw-r--r-- | build/opnfv-apex-common.spec | 4 |
3 files changed, 4 insertions, 3 deletions
diff --git a/build/build_perf_image.sh b/build/build_perf_image.sh index c91b563d..a6ca066b 100644 --- a/build/build_perf_image.sh +++ b/build/build_perf_image.sh @@ -27,8 +27,6 @@ fi if [ "$CATEGORY" == "nova" ]; then if [ "$KEY" == "libvirtpin" ]; then sudo sed -i "s/#LibvirtCPUPinSet:.*/LibvirtCPUPinSet: '${VALUE}'/" /usr/share/openstack-tripleo-heat-templates/environments/numa.yaml - sudo sed -i "s/^#resource_registry:/resource_registry:/" /usr/share/openstack-tripleo-heat-templates/environments/numa.yaml - sudo sed -i "s/# {numa}/ OS::TripleO::ComputeExtraConfigPre: ..\/puppet\/extraconfig\/pre_deploy\/compute\/numa.yaml/" /usr/share/openstack-tripleo-heat-templates/environments/numa.yaml fi fi diff --git a/build/network-environment.yaml b/build/network-environment.yaml index 4493322a..8b5b070c 100644 --- a/build/network-environment.yaml +++ b/build/network-environment.yaml @@ -39,7 +39,6 @@ resource_registry: OS::TripleO::Compute::Net::SoftwareConfig: nics/compute.yaml OS::TripleO::Controller::Net::SoftwareConfig: nics/controller.yaml - parameter_defaults: NeutronExternalNetworkBridge: 'br-ex' ControlPlaneSubnetCidr: "24" diff --git a/build/opnfv-apex-common.spec b/build/opnfv-apex-common.spec index 854fbbb6..6b86bf87 100644 --- a/build/opnfv-apex-common.spec +++ b/build/opnfv-apex-common.spec @@ -35,6 +35,7 @@ install ci/util.sh %{buildroot}%{_bindir}/opnfv-util mkdir -p %{buildroot}%{_sysconfdir}/opnfv-apex/ install config/deploy/os-nosdn-nofeature-noha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-nosdn-nofeature-noha.yaml +install config/deploy/os-nosdn-fdio-noha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-nosdn-fdio-noha.yaml install config/deploy/os-nosdn-ovs-noha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-nosdn-ovs-noha.yaml install config/deploy/os-nosdn-nofeature-ha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-nosdn-nofeature-ha.yaml install config/deploy/os-nosdn-performance-ha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-nosdn-performance-ha.yaml @@ -104,6 +105,7 @@ install config/inventory/pod_example_settings.yaml %{buildroot}%{_docdir}/opnfv/ %{_var}/opt/opnfv/lib/installer/onos/onos_gw_mac_update.sh %{_var}/opt/opnfv/lib/installer/domain.xml %{_sysconfdir}/opnfv-apex/os-nosdn-nofeature-noha.yaml +%{_sysconfdir}/opnfv-apex/os-nosdn-fdio-noha.yaml %{_sysconfdir}/opnfv-apex/os-nosdn-ovs-noha.yaml %{_sysconfdir}/opnfv-apex/os-nosdn-nofeature-ha.yaml %{_sysconfdir}/opnfv-apex/os-nosdn-performance-ha.yaml @@ -129,6 +131,8 @@ install config/inventory/pod_example_settings.yaml %{buildroot}%{_docdir}/opnfv/ %doc %{_docdir}/opnfv/inventory.yaml.example %changelog +* Thu Aug 1 2016 Tim Rozet <trozet@redhat.com> - 3.0-11 +- Add nosdn fdio scenarios. * Tue Jul 5 2016 Dan Radez <dradez@redhat.com> - 3.0-10 - Adding functions.sh files * Thu Jun 15 2016 Tim Rozet <trozet@redhat.com> - 3.0-9 |