openstack
/
magnum
Code Issues Proposed changes

Fix jenkins failure for image not found 

Seems jenkins default image API version is 2, image v2 version
not support use name as image-show. I tried latest devstack, it
calls v2 API. So in jenkins jobs let's use v1 version now.

In addition, specify the mountpoint parameter on VolumeAttachment
resource. Heat used to allow missing of this parameter but it is
not the case anymore.

Change-Id: I1ae1eb20b9552444f0242a72e958c139209bf1f6
Closes-Bug: #1491314
This commit is contained in:
Kai Qiang Wu(Kennan) 2015-09-02 09:47:56 +00:00 committed by Hongbin Lu
parent de22f83fd2
commit 48ea311eaa
3 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
magnum/templates/heat-kubernetes/kubeminion-coreos.yaml
View File

@ -231,6 +231,7 @@ resources:
properties:
instance_uuid: {get_resource: kube_minion}
volume_id: {get_resource: docker_volume}
mountpoint: /dev/vdb
outputs:

1
magnum/templates/heat-kubernetes/kubeminion.yaml
View File

@ -220,6 +220,7 @@ resources:
properties:
instance_uuid: {get_resource: kube_minion}
volume_id: {get_resource: docker_volume}
mountpoint: /dev/vdb
outputs:

2
magnum/tests/contrib/post_test_hook.sh
View File

@ -55,7 +55,7 @@ popd
# First we test Magnum's command line to see if we can stand up
# a baymodel, bay and a pod
export NIC_ID=$(neutron net-show public | awk '/ id /{print $4}')
export IMAGE_ID=$(glance image-show fedora-21-atomic-3 | awk '/ id /{print $4}')
export IMAGE_ID=$(glance --os-image-api-version 1 image-show fedora-21-atomic-3 | awk '/ id /{print $4}')
# pass the appropriate variables via a config file