diff options
| author |   Feng Pan <fpan@redhat.com> | 2017-05-17 23:57:53 -0400 |
|---|---|---|
| committer | Feng Pan <fpan@redhat.com> | 2017-05-25 15:07:21 -0400 |
| commit | 983c23e49dd1312c7cf66d528261441be458b29e (patch) | |
| tree | 2466acc4991e98ded9e8540b8cb02d7b955e1aaa | |
| parent | 67c901485aa5a46d05833edc534f202463bf9f9e (diff) | |
Build and deployment fixes for danube
- Remove puppet-neutron-add-odl-settings.patch file, this patch is now
included in overcloud images.
- Add retry for pacemaker::stonith resource to avoid resource creation
failure during deployment
opnfv-puppet-tripleo-pr: 27
Change-Id: I8440e7ddc290d04135e8cd82b2136cc245dc980a
Signed-off-by: Feng Pan <fpan@redhat.com>
| -rwxr-xr-x | build/overcloud-full.sh | 2 | ||||
| -rw-r--r-- | build/patches/puppet-neutron-add-odl-settings.patch | 47 | ||||
| -rw-r--r-- | build/variables.sh | 2 |
3 files changed, 1 insertions, 50 deletions
diff --git a/build/overcloud-full.sh b/build/overcloud-full.sh index 917d1521..786424d9 100755 --- a/build/overcloud-full.sh +++ b/build/overcloud-full.sh @@ -146,8 +146,6 @@ LIBGUESTFS_BACKEND=direct virt-customize \ --run-command "yumdownloader --destdir=/root/ovs27 openvswitch*2.7* python-openvswitch-2.7*" \ --run-command "pip install python-senlinclient" \ --run-command "sed -i -E 's/timeout=[0-9]+/timeout=60/g' /usr/share/openstack-puppet/modules/rabbitmq/lib/puppet/provider/rabbitmqctl.rb" \ - --upload ${BUILD_ROOT}/patches/puppet-neutron-add-odl-settings.patch:/usr/share/openstack-puppet/modules/neutron/ \ - --run-command "cd /usr/share/openstack-puppet/modules/neutron && patch -p1 < puppet-neutron-add-odl-settings.patch" \ --upload ${CACHE_DIR}/$kvmfornfv_kernel_rpm:/root/ \ --upload ${BUILD_ROOT}/patches/puppet-neutron-vpp-ml2.patch:/usr/share/openstack-puppet/modules/neutron/ \ --run-command "cd /usr/share/openstack-puppet/modules/neutron && patch -p1 < puppet-neutron-vpp-ml2.patch" \ diff --git a/build/patches/puppet-neutron-add-odl-settings.patch b/build/patches/puppet-neutron-add-odl-settings.patch deleted file mode 100644 index aa0b35a1..00000000 --- a/build/patches/puppet-neutron-add-odl-settings.patch +++ /dev/null @@ -1,47 +0,0 @@ -diff --git a/manifests/plugins/ml2/opendaylight.pp b/manifests/plugins/ml2/opendaylight.pp -index a27c4d6..13b56c4 100644 ---- a/manifests/plugins/ml2/opendaylight.pp -+++ b/manifests/plugins/ml2/opendaylight.pp -@@ -29,12 +29,22 @@ - # (optional) The URI used to connect to the local OVSDB server - # Defaults to 'tcp:127.0.0.1:6639' - # -+# [*port_binding_controller*] -+# (optional) Name of the controller to be used for port binding. -+# Defaults to $::os_service_default -+# -+# [*odl_hostconf_uri*] -+# (optional) Path for ODL host configuration REST interface. -+# Defaults to $::os_service_default -+# - class neutron::plugins::ml2::opendaylight ( -- $package_ensure = 'present', -- $odl_username = $::os_service_default, -- $odl_password = $::os_service_default, -- $odl_url = $::os_service_default, -- $ovsdb_connection = 'tcp:127.0.0.1:6639', -+ $package_ensure = 'present', -+ $odl_username = $::os_service_default, -+ $odl_password = $::os_service_default, -+ $odl_url = $::os_service_default, -+ $ovsdb_connection = 'tcp:127.0.0.1:6639', -+ $port_binding_controller = $::os_service_default, -+ $odl_hostconf_uri = $::os_service_default, - ) { - - include ::neutron::deps -@@ -48,9 +58,11 @@ class neutron::plugins::ml2::opendaylight ( - ) - - neutron_plugin_ml2 { -- 'ml2_odl/username': value => $odl_username; -- 'ml2_odl/password': value => $odl_password; -- 'ml2_odl/url': value => $odl_url; -+ 'ml2_odl/username': value => $odl_username; -+ 'ml2_odl/password': value => $odl_password; -+ 'ml2_odl/url': value => $odl_url; -+ 'ml2_odl/port_binding_controller': value => $port_binding_controller; -+ 'ml2_odl/odl_hostconf_uri': value => $odl_hostconf_uri; - } - - neutron_config { diff --git a/build/variables.sh b/build/variables.sh index a496608a..789ca76d 100644 --- a/build/variables.sh +++ b/build/variables.sh @@ -26,7 +26,7 @@ onos_ovs_pkg=package_ovs_rpm3.tar.gz if [ -z ${GS_PATHNAME+x} ]; then GS_PATHNAME=/colorado fi -dpdk_uri_base=http://artifacts.opnfv.org/ovsnfv +dpdk_uri_base=http://artifacts.opnfv.org/ovsnfv/danube dpdk_rpms=( 'ovs4opnfv-e8acab14-dpdk-16.11-5.el7.centos.x86_64.rpm' 'ovs4opnfv-e8acab14-dpdk-devel-16.11-5.el7.centos.x86_64.rpm' |