diff -Nru heat-6.1.1/AUTHORS heat-6.1.2/AUTHORS --- heat-6.1.1/AUTHORS 2017-01-31 20:57:05.000000000 +0000 +++ heat-6.1.2/AUTHORS 2017-04-24 13:47:59.000000000 +0000 @@ -343,6 +343,7 @@ rajiv rico.lin ricolin +ricolin root sabeensyed sdake diff -Nru heat-6.1.1/ChangeLog heat-6.1.2/ChangeLog --- heat-6.1.1/ChangeLog 2017-01-31 20:57:05.000000000 +0000 +++ heat-6.1.2/ChangeLog 2017-04-24 13:47:58.000000000 +0000 @@ -1,6 +1,14 @@ CHANGES ======= +6.1.2 +----- + +* Stop showing json deserialized message in log +* Try to fix local.conf creation in tests +* Use region_name when creating keystone client +* Prepare for using standard python tests + 6.1.1 ----- diff -Nru heat-6.1.1/debian/changelog heat-6.1.2/debian/changelog --- heat-6.1.1/debian/changelog 2017-02-27 16:14:03.000000000 +0000 +++ heat-6.1.2/debian/changelog 2017-06-07 08:35:21.000000000 +0000 @@ -1,3 +1,9 @@ +heat (1:6.1.2-0ubuntu1) xenial; urgency=medium + + * New upstream point release for OpenStack Mitaka (LP: #1696177). + + -- James Page Wed, 07 Jun 2017 09:35:21 +0100 + heat (1:6.1.1-0ubuntu1) xenial; urgency=medium * New upstream stable point release for OpenStack Mitaka (LP: #1668313) diff -Nru heat-6.1.1/HACKING.rst heat-6.1.2/HACKING.rst --- heat-6.1.1/HACKING.rst 2017-01-31 20:55:15.000000000 +0000 +++ heat-6.1.2/HACKING.rst 2017-04-24 13:45:00.000000000 +0000 @@ -41,3 +41,6 @@ uses.) More information about testr can be found at: http://wiki.openstack.org/testr +Note that unit tests use a database if available. See +``tools/test-setup.sh`` on how to set up the databases the same way as +done in the OpenStack CI systems. diff -Nru heat-6.1.1/heat/common/heat_keystoneclient.py heat-6.1.2/heat/common/heat_keystoneclient.py --- heat-6.1.1/heat/common/heat_keystoneclient.py 2017-01-31 20:55:15.000000000 +0000 +++ heat-6.1.2/heat/common/heat_keystoneclient.py 2017-04-24 13:45:00.000000000 +0000 @@ -112,6 +112,10 @@ return self._client @property + def region_name(self): + return self.context.region_name or cfg.CONF.region_name_for_services + + @property def domain_admin_auth(self): if not self._domain_admin_auth: # Note we must specify the domain when getting the token @@ -140,13 +144,15 @@ if not self._domain_admin_client: self._domain_admin_client = kc_v3.Client( session=self.session, - auth=self.domain_admin_auth) + auth=self.domain_admin_auth, + region_name=self.region_name) return self._domain_admin_client def _v3_client_init(self): client = kc_v3.Client(session=self.session, - auth=self.context.auth_plugin) + auth=self.context.auth_plugin, + region_name=self.region_name) if hasattr(self.context.auth_plugin, 'get_access'): # NOTE(jamielennox): get_access returns the current token without diff -Nru heat-6.1.1/heat/common/serializers.py heat-6.1.2/heat/common/serializers.py --- heat-6.1.1/heat/common/serializers.py 2017-01-31 20:55:14.000000000 +0000 +++ heat-6.1.2/heat/common/serializers.py 2017-04-24 13:44:57.000000000 +0000 @@ -37,7 +37,11 @@ return six.text_type(obj) response = jsonutils.dumps(data, default=sanitizer) - LOG.debug("JSON response : %s" % response) + + # TODO(ricolin): Fix response through private credential information, + # before enable below debug message. + # LOG.debug("JSON response : %s" % response) + return response def default(self, response, result): diff -Nru heat-6.1.1/heat/tests/clients/test_heat_client.py heat-6.1.2/heat/tests/clients/test_heat_client.py --- heat-6.1.1/heat/tests/clients/test_heat_client.py 2017-01-31 20:55:15.000000000 +0000 +++ heat-6.1.2/heat/tests/clients/test_heat_client.py 2017-04-24 13:45:00.000000000 +0000 @@ -91,7 +91,8 @@ m.AndReturn(mock_ks_auth) n = kc_v3.Client(session=mox.IsA(ks_session.Session), - auth=mock_ks_auth) + auth=mock_ks_auth, + region_name=None) n.AndReturn(self.mock_admin_client) self.mock_admin_client.domains = self.mock_ks_v3_client_domain_mngr @@ -131,7 +132,8 @@ if client: c = kc_v3.Client(session=mox.IsA(ks_session.Session), - auth=mock_ks_auth) + auth=mock_ks_auth, + region_name=None) c.AndReturn(self.mock_ks_v3_client) if stub_trust_context: @@ -1482,7 +1484,8 @@ m.AndReturn(mock_ks_auth) n = kc_v3.Client(session=mox.IsA(ks_session.Session), - auth=mock_ks_auth) + auth=mock_ks_auth, + region_name=None) n.AndReturn(self.mock_admin_client) self.mock_admin_client.domains = self.mock_ks_v3_client_domain_mngr diff -Nru heat-6.1.1/heat.egg-info/pbr.json heat-6.1.2/heat.egg-info/pbr.json --- heat-6.1.1/heat.egg-info/pbr.json 2017-01-31 20:57:05.000000000 +0000 +++ heat-6.1.2/heat.egg-info/pbr.json 2017-04-24 13:47:59.000000000 +0000 @@ -1 +1 @@ -{"is_release": true, "git_version": "32fefb7"} \ No newline at end of file +{"is_release": true, "git_version": "4da6f1a"} \ No newline at end of file diff -Nru heat-6.1.1/heat.egg-info/PKG-INFO heat-6.1.2/heat.egg-info/PKG-INFO --- heat-6.1.1/heat.egg-info/PKG-INFO 2017-01-31 20:57:05.000000000 +0000 +++ heat-6.1.2/heat.egg-info/PKG-INFO 2017-04-24 13:47:59.000000000 +0000 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: heat -Version: 6.1.1 +Version: 6.1.2 Summary: OpenStack Orchestration Home-page: http://www.openstack.org/ Author: OpenStack diff -Nru heat-6.1.1/heat.egg-info/SOURCES.txt heat-6.1.2/heat.egg-info/SOURCES.txt --- heat-6.1.1/heat.egg-info/SOURCES.txt 2017-01-31 20:57:06.000000000 +0000 +++ heat-6.1.2/heat.egg-info/SOURCES.txt 2017-04-24 13:48:00.000000000 +0000 @@ -996,4 +996,5 @@ tools/pretty_tox.sh tools/subunit-trace.py tools/test-requires-deb -tools/test-requires-rpm \ No newline at end of file +tools/test-requires-rpm +tools/test-setup.sh \ No newline at end of file diff -Nru heat-6.1.1/heat_integrationtests/pre_test_hook.sh heat-6.1.2/heat_integrationtests/pre_test_hook.sh --- heat-6.1.1/heat_integrationtests/pre_test_hook.sh 2017-01-31 20:55:15.000000000 +0000 +++ heat-6.1.2/heat_integrationtests/pre_test_hook.sh 2017-04-24 13:45:00.000000000 +0000 @@ -16,12 +16,8 @@ set -x -localrc_path=$BASE/new/devstack/localrc localconf=$BASE/new/devstack/local.conf -echo "CEILOMETER_PIPELINE_INTERVAL=60" >> $localrc_path -echo "HEAT_ENABLE_ADOPT_ABANDON=True" >> $localrc_path - echo -e '[[post-config|$HEAT_CONF]]\n[DEFAULT]\n' >> $localconf if [ "$ENABLE_CONVERGENCE" == "true" ] ; then @@ -41,9 +37,13 @@ echo -e '[[post-config|/etc/neutron/neutron_vpnaas.conf]]\n' >> $localconf echo -e '[service_providers]\nservice_provider=VPN:openswan:neutron_vpnaas.services.vpn.service_drivers.ipsec.IPsecVPNDriver:default\n' >> $localconf + +echo "[[local|localrc]]" >> $localconf +echo "CEILOMETER_PIPELINE_INTERVAL=60" >> $localconf +echo "HEAT_ENABLE_ADOPT_ABANDON=True" >> $localconf # Use the lbaas v2 namespace driver for devstack integration testing since # octavia uses nested vms. if [[ $OVERRIDE_ENABLED_SERVICES =~ "q-lbaasv2" ]] then - echo "NEUTRON_LBAAS_SERVICE_PROVIDERV2=LOADBALANCERV2:Haproxy:neutron_lbaas.drivers.haproxy.plugin_driver.HaproxyOnHostPluginDriver:default" >> $localrc_path + echo "NEUTRON_LBAAS_SERVICE_PROVIDERV2=LOADBALANCERV2:Haproxy:neutron_lbaas.drivers.haproxy.plugin_driver.HaproxyOnHostPluginDriver:default" >> $localconf fi diff -Nru heat-6.1.1/PKG-INFO heat-6.1.2/PKG-INFO --- heat-6.1.1/PKG-INFO 2017-01-31 20:57:06.000000000 +0000 +++ heat-6.1.2/PKG-INFO 2017-04-24 13:48:00.000000000 +0000 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: heat -Version: 6.1.1 +Version: 6.1.2 Summary: OpenStack Orchestration Home-page: http://www.openstack.org/ Author: OpenStack diff -Nru heat-6.1.1/tools/test-setup.sh heat-6.1.2/tools/test-setup.sh --- heat-6.1.1/tools/test-setup.sh 1970-01-01 00:00:00.000000000 +0000 +++ heat-6.1.2/tools/test-setup.sh 2017-04-24 13:44:57.000000000 +0000 @@ -0,0 +1,57 @@ +#!/bin/bash -xe + +# This script will be run by OpenStack CI before unit tests are run, +# it sets up the test system as needed. +# Developers should setup their test systems in a similar way. + +# This setup needs to be run as a user that can run sudo. + +# The root password for the MySQL database; pass it in via +# MYSQL_ROOT_PW. +DB_ROOT_PW=${MYSQL_ROOT_PW:-insecure_slave} + +# This user and its password are used by the tests, if you change it, +# your tests might fail. +DB_USER=openstack_citest +DB_PW=openstack_citest + +sudo -H mysqladmin -u root password $DB_ROOT_PW + +# It's best practice to remove anonymous users from the database. If +# a anonymous user exists, then it matches first for connections and +# other connections from that host will not work. +sudo -H mysql -u root -p$DB_ROOT_PW -h localhost -e " + DELETE FROM mysql.user WHERE User=''; + FLUSH PRIVILEGES; + GRANT ALL PRIVILEGES ON *.* + TO '$DB_USER'@'%' identified by '$DB_PW' WITH GRANT OPTION;" + +# Now create our database. +mysql -u $DB_USER -p$DB_PW -h 127.0.0.1 -e " + SET default_storage_engine=MYISAM; + DROP DATABASE IF EXISTS openstack_citest; + CREATE DATABASE openstack_citest CHARACTER SET utf8;" + +# Same for PostgreSQL +# The root password for the PostgreSQL database; pass it in via +# POSTGRES_ROOT_PW. +DB_ROOT_PW=${POSTGRES_ROOT_PW:-insecure_slave} + +# Setup user +root_roles=$(sudo -H -u postgres psql -t -c " + SELECT 'HERE' from pg_roles where rolname='$DB_USER'") +if [[ ${root_roles} == *HERE ]];then + sudo -H -u postgres psql -c "ALTER ROLE $DB_USER WITH SUPERUSER LOGIN PASSWORD '$DB_PW'" +else + sudo -H -u postgres psql -c "CREATE ROLE $DB_USER WITH SUPERUSER LOGIN PASSWORD '$DB_PW'" +fi + +# Store password for tests +cat << EOF > $HOME/.pgpass +*:*:*:$DB_USER:$DB_PW +EOF +chmod 0600 $HOME/.pgpass + +# Now create our database +psql -h 127.0.0.1 -U $DB_USER -d template1 -c "DROP DATABASE IF EXISTS openstack_citest" +createdb -h 127.0.0.1 -U $DB_USER -l C -T template0 -E utf8 openstack_citest