diff options
| author |   Dan Radez <dradez@redhat.com> | 2017-08-25 18:24:50 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-08-25 18:24:50 +0000 |
| commit | 2ebb431beffab428076a46101919c1ab39a3ecb0 (patch) | |
| tree | f8a43f7cb6490158e854b01cacfcd5aff2744b71 /build/overcloud-full.sh | |
| parent | 34aad90040da4094a4288f6cbdf1acddb5f4628c (diff) | |
| parent | 98e127b8f2b026355d1438970bbadce2c95898fa (diff) | |
Merge "Updates and additions to handle aarch64"
Diffstat (limited to 'build/overcloud-full.sh')
| -rwxr-xr-x | build/overcloud-full.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/build/overcloud-full.sh b/build/overcloud-full.sh index 71e8dcfd..8efe8225 100755 --- a/build/overcloud-full.sh +++ b/build/overcloud-full.sh @@ -69,6 +69,10 @@ LIBGUESTFS_BACKEND=direct virt-customize \ --upload ${BUILD_ROOT}/patches/neutron_openstackclient_dps.patch:/usr/lib/python2.7/site-packages/ \ --upload ${BUILD_ROOT}/patches/puppet-neutron-add-sfc.patch:/usr/share/openstack-puppet/modules/neutron/ \ --upload ${BUILD_ROOT}/patches/congress-parallel-execution.patch:/usr/lib/python2.7/site-packages/ \ + --upload ${BUILD_ROOT}/patches/puppet-neutron-ml2-ip-version-fix.patch:/usr/share/openstack-puppet/modules/neutron/ \ + --run-command "cd /usr/share/openstack-puppet/modules/neutron && patch -p1 < puppet-neutron-ml2-ip-version-fix.patch" \ + --upload ${BUILD_ROOT}/patches/puppet-neutron-vpp-ml2-type_drivers-setting.patch:/usr/share/openstack-puppet/modules/neutron/ \ + --run-command "cd /usr/share/openstack-puppet/modules/neutron && patch -p1 < puppet-neutron-vpp-ml2-type_drivers-setting.patch" \ -a overcloud-full_build.qcow2 # apply neutron port data plane status patches @@ -143,10 +147,6 @@ LIBGUESTFS_BACKEND=direct virt-customize \ --install python2-networking-sfc \ --install python-etcd,puppet-etcd \ --install patch \ - --upload ${BUILD_ROOT}/patches/puppet-neutron-ml2-ip-version-fix.patch:/usr/share/openstack-puppet/modules/neutron/ \ - --run-command "cd /usr/share/openstack-puppet/modules/neutron && patch -p1 < puppet-neutron-ml2-ip-version-fix.patch" \ - --upload ${BUILD_ROOT}/patches/puppet-neutron-vpp-ml2-type_drivers-setting.patch:/usr/share/openstack-puppet/modules/neutron/ \ - --run-command "cd /usr/share/openstack-puppet/modules/neutron && patch -p1 < puppet-neutron-vpp-ml2-type_drivers-setting.patch" \ -a overcloud-full_build.qcow2 # upload and install barometer packages |