openstack
/
heat
Code Issues Proposed changes

Fix barbicanclient and glance upload issue 

It seems for py35 job barbicanclient is installed from source.

Ib91e7049de007f4d4254abcd4c125b4dc7e03c55 has made some backward
incompatible changes.

This also changes to upload images using $IMAGE_URLS, so
the images are stored locally and then uploaded.

Change-Id: I9d3d9dabdfca0442bd17f93ce69ef9753049dc23
Closes-Bug: #1704725
This commit is contained in:
rabi 2017-07-17 12:03:27 +05:30
parent f74c00b8cb
commit 3ae539bbf9
4 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
heat/engine/clients/os/barbican.py
View File

@ -11,13 +11,17 @@
# License for the specific language governing permissions and limitations
# under the License.
from barbicanclient import client as barbican_client
from barbicanclient import containers
from barbicanclient import exceptions
from heat.common import exception
from heat.engine.clients import client_plugin
from heat.engine import constraints
try:
from barbicanclient import containers
except ImportError:
from barbicanclient.v1 import containers
CLIENT_NAME = 'barbican'

2
heat_integrationtests/cleanup_test_env.sh
View File

@ -30,4 +30,4 @@ openstack flavor delete m1.heat_int
openstack flavor delete m1.heat_micro
# delete the image created
openstack image delete fedora-heat-test-image
openstack image delete Fedora-Cloud-Base-24-1.2.x86_64

3
heat_integrationtests/pre_test_hook.sh
View File

@ -44,6 +44,9 @@ echo -e '[[post-config|$NOVA_CONF]]\n[DEFAULT]\n' >> $localconf
echo -e 'quota_driver=nova.quota.NoopQuotaDriver\n' >> $localconf
echo "[[local|localrc]]" >> $localconf
# Create the images required for testing
echo "IMAGE_URLS+=http://fedora.bhs.mirrors.ovh.net/linux/releases/24/CloudImages/x86_64/images/Fedora-Cloud-Base-24-1.2.x86_64.qcow2" >> $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

10
heat_integrationtests/prepare_test_env.sh
View File

@ -51,15 +51,7 @@ iniset $conf_file heat_plugin minimal_instance_type m1.heat_micro
openstack flavor create m1.heat_int --ram 512
openstack flavor create m1.heat_micro --ram 128
# Register the glance image for testing
curl http://fedora.bhs.mirrors.ovh.net/linux/releases/24/CloudImages/x86_64/images/Fedora-Cloud-Base-24-1.2.x86_64.qcow2 | openstack image create fedora-heat-test-image --disk-format qcow2 --container-format bare --public
if [[ ${PIPESTATUS[0]} -ne 0 ]]; then
# The curl command failed, so the upload is mostly likely incorrect. Let's
# bail out early.
exit 1
fi
iniset $conf_file heat_plugin image_ref fedora-heat-test-image
iniset $conf_file heat_plugin image_ref Fedora-Cloud-Base-24-1.2.x86_64
iniset $conf_file heat_plugin boot_config_env $DEST/heat-templates/hot/software-config/boot-config/test_image_env.yaml
iniset $conf_file heat_plugin heat_config_notify_script $DEST/heat-templates/hot/software-config/elements/heat-config/bin/heat-config-notify
iniset $conf_file heat_plugin minimal_image_ref cirros-0.3.5-x86_64-disk