diff options
| -rw-r--r-- | build/cache.sh | 2 | ||||
| -rw-r--r-- | build/opnfv-environment.yaml | 5 | ||||
| -rwxr-xr-x | build/overcloud-full.sh | 3 | ||||
| -rw-r--r-- | build/python-congressclient.diff | 25 | ||||
| -rwxr-xr-x | build/undercloud.sh | 3 | ||||
| -rw-r--r-- | build/variables.sh | 1 | ||||
| -rw-r--r-- | ci/PR_revision.log | 2 | ||||
| -rwxr-xr-x | lib/post-install-functions.sh | 9 |
8 files changed, 49 insertions, 1 deletions
diff --git a/build/cache.sh b/build/cache.sh index 123748a2..4d41a7a2 100644 --- a/build/cache.sh +++ b/build/cache.sh @@ -60,7 +60,7 @@ function populate_cache { else my_md5=$(grep ${filename} $CACHE_DIR/.cache | awk {'print $1'}) if [ "$remote_md5" != "$my_md5" ]; then - echo "MD5 mismatch: Remote MD5 is ${remote_md5}, Cache file MD5 is ${my_md5}" + echo "MD5 mismatch, cache file MD5 is ${my_md5}" echo "Downloading $filename" curl_file $1 $filename else diff --git a/build/opnfv-environment.yaml b/build/opnfv-environment.yaml index 54b1e6f2..7a3ae739 100644 --- a/build/opnfv-environment.yaml +++ b/build/opnfv-environment.yaml @@ -8,3 +8,8 @@ parameters: EnableSahara: false ExtraConfig: tripleo::ringbuilder::build_ring: False + nova::policy::policies: + nova-os_compute_api:servers:show:host_status: + key: 'os_compute_api:servers:show:host_status' + value: 'rule:admin_or_owner' + diff --git a/build/overcloud-full.sh b/build/overcloud-full.sh index 936decc3..01f40269 100755 --- a/build/overcloud-full.sh +++ b/build/overcloud-full.sh @@ -64,6 +64,7 @@ popd > /dev/null # enable connection tracking for protocal sctp # install the congress rpms # upload and explode the congress puppet module +# install doctor driver ## Can be removed in Newton LIBGUESTFS_BACKEND=direct virt-customize \ --upload ../opnfv-puppet-tripleo.tar.gz:/etc/puppet/modules \ --run-command "sed -i 's/^#UseDNS.*$/UseDNS no/' /etc/ssh/sshd_config" \ @@ -81,6 +82,8 @@ LIBGUESTFS_BACKEND=direct virt-customize \ --install "python2-congressclient" \ --upload puppet-congress.tar.gz:/etc/puppet/modules/ \ --run-command "cd /etc/puppet/modules/ && tar xzf puppet-congress.tar.gz" \ + --run-command "cd /usr/lib/python2.7/site-packages/congress/datasources && curl -O $doctor_driver" \ + --run-command "sed -i \"s/'--detailed-exitcodes',/'--detailed-exitcodes','-l','syslog','-l','console',/g\" /var/lib/heat-config/hooks/puppet" \ -a overcloud-full_build.qcow2 mv -f overcloud-full_build.qcow2 overcloud-full.qcow2 diff --git a/build/python-congressclient.diff b/build/python-congressclient.diff new file mode 100644 index 00000000..82e76e07 --- /dev/null +++ b/build/python-congressclient.diff @@ -0,0 +1,25 @@ +From 26d39efbb931e04a5e95d504c27ede12d0a81c43 Mon Sep 17 00:00:00 2001 +From: Masahito Muroi <muroi.masahito@lab.ntt.co.jp> +Date: Fri, 25 Mar 2016 14:06:00 +0900 +Subject: [PATCH] Allows DataSource's config field to have not dict type obj + +CongressClient expects all datasource driver has dict object in +config field. It raises an error when a datasource doesn't have +any config. + +This patch allows config fields to be None object. + +Change-Id: I73354f1073f3f814854652eaeaa4b3bbe4bfcf7d +--- + +diff --git a/congressclient/common/utils.py b/congressclient/common/utils.py +index 9a381e8..b5cedd4 100644 +--- a/congressclient/common/utils.py ++++ b/congressclient/common/utils.py +@@ -77,6 +77,8 @@ + :param data: a dict + :rtype: a string formatted to {a:b, c:d} + """ ++ if not isinstance(data, dict): ++ return str(data) + return str({str(key): str(value) for key, value in data.items()}) diff --git a/build/undercloud.sh b/build/undercloud.sh index 9873c177..7b40625e 100755 --- a/build/undercloud.sh +++ b/build/undercloud.sh @@ -27,6 +27,7 @@ pushd images > /dev/null # enabling ceph OSDs to live on the controller # OpenWSMan package update supports the AMT Ironic driver for the TealBox # seeding configuration files specific to OPNFV +# add congress client and apply: https://review.openstack.org/#/c/297515/ # add congress password to python-triploclient LIBGUESTFS_BACKEND=direct virt-customize \ --upload ../opnfv-tht.tar.gz:/usr/share \ @@ -39,6 +40,8 @@ LIBGUESTFS_BACKEND=direct virt-customize \ --upload ../opnfv-environment.yaml:/home/stack/ \ --upload ../virtual-environment.yaml:/home/stack/ \ --install "python2-congressclient" \ + --upload ../python-congressclient.diff:/tmp \ + --run-command "cd /usr/lib/python2.7/site-packages && patch -p1 < /tmp/python-congressclient.diff" \ --run-command "sed -i '/SERVICE_LIST/a\\ \x27congress\x27: {\x27password_field\x27: \x27OVERCLOUD_CONGRESS_PASSWORD\x27},' /usr/lib/python2.7/site-packages/tripleoclient/constants.py" \ --run-command "sed -i '/PASSWORD_NAMES =/a\\ \"OVERCLOUD_CONGRESS_PASSWORD\",' /usr/lib/python2.7/site-packages/tripleoclient/utils.py" \ --run-command "sed -i '/AodhPassword/a\\ parameters\[\x27CongressPassword\x27\] = passwords\[\x27OVERCLOUD_CONGRESS_PASSWORD\x27\]' /usr/lib/python2.7/site-packages/tripleoclient/v1/overcloud_deploy.py" \ diff --git a/build/variables.sh b/build/variables.sh index 78a03fd9..6632b526 100644 --- a/build/variables.sh +++ b/build/variables.sh @@ -14,6 +14,7 @@ onos_release_file=onos-1.6.0-rc2.tar.gz onos_jdk_uri=https://www.dropbox.com/s/qyujpib8zyhzeev onos_ovs_uri=https://www.dropbox.com/s/7rfr9l2qz3a36cc openstack_congress=https://radez.fedorapeople.org/openstack-congress-2016.1-1.fc24.noarch.rpm +doctor_driver=https://raw.githubusercontent.com/muroi/congress/doctor-poc/congress/datasources/doctor_driver.py dpdk_uri_base=http://artifacts.opnfv.org/ovsnfv dpdk_rpms=( diff --git a/ci/PR_revision.log b/ci/PR_revision.log index a63d491d..de62cb6b 100644 --- a/ci/PR_revision.log +++ b/ci/PR_revision.log @@ -10,3 +10,5 @@ 26,Fixes ODL ML2 IP 30,Adds OVS DPDK config 33,Removes QOS service plugin from Neutron +35,Use nic1 as control plane inteface name instead of default br-ex +38,Fixes nova default floating pool to be 'external' diff --git a/lib/post-install-functions.sh b/lib/post-install-functions.sh index 75207ba2..912a2a11 100755 --- a/lib/post-install-functions.sh +++ b/lib/post-install-functions.sh @@ -64,6 +64,14 @@ EOI done fi + # TODO fix this when HA SDN controllers are supported + if [ "${deploy_options_array['sdn_controller']}" != 'False' ]; then + echo -e "${blue}INFO: Finding SDN Controller IP for overcloudrc...${reset}" + sdn_controller_ip=$(overcloud_connect controller0 "facter ipaddress_br_ex") + echo -e "${blue}INFO: SDN Controller IP is ${sdn_controller_ip} ${reset}" + undercloud_connect stack "echo 'export SDN_CONTROLLER_IP=${sdn_controller_ip}' >> /home/stack/overcloudrc" + fi + ssh -T ${SSH_OPTIONS[@]} "stack@$UNDERCLOUD" <<EOI source overcloudrc set -o errexit @@ -91,6 +99,7 @@ if [ "${deploy_options_array['congress']}" == 'True' ]; then --config password=\$OS_PASSWORD \\ --config auth_url=\$OS_AUTH_URL done + openstack congress datasource create doctor "doctor" fi EOI |