summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrey Pavlov <andrey.mp@gmail.com>2017-10-13 10:13:38 +0300
committerAndrey Pavlov <andrey.mp@gmail.com>2017-10-13 10:13:38 +0300
commit2f87f8961c0c36ca10107126933481fdcd6e3a6d (patch)
tree460a1aa22fa3ef2e60e2ec60036246c009454e2a
parent240878f9e8f2878c9871cb262995fdf6f5f6a98b (diff)
fix EBS image creation in Ocatastable/ocata
Ocata's devstack still uses ami/aki/ari cirros image. But incorrect code with 'bare' type was merged some time ago. Need to change back 'bare' to 'ami'. Change-Id: Ie1729f67f12e68117df742650b66b7bddef3d868
Notes
Notes (review): Verified+1: Jenkins Code-Review+2: Andrey Pavlov <andrey.mp@gmail.com> Workflow+1: Andrey Pavlov <andrey.mp@gmail.com> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Mon, 16 Oct 2017 13:19:49 +0000 Reviewed-on: https://review.openstack.org/511741 Project: openstack/ec2-api Branch: refs/heads/stable/ocata
-rwxr-xr-xdevstack/create_config2
1 files changed, 1 insertions, 1 deletions
diff --git a/devstack/create_config b/devstack/create_config
index cfe78f0..463da06 100755
--- a/devstack/create_config
+++ b/devstack/create_config
@@ -139,7 +139,7 @@ auth="--os-project-name $project_name --os-username $user_name --os-password pas
139volume_status() { cinder $auth show $1|awk '/ status / {print $4}'; } 139volume_status() { cinder $auth show $1|awk '/ status / {print $4}'; }
140instance_status() { nova $auth show $1|awk '/ status / {print $4}'; } 140instance_status() { nova $auth show $1|awk '/ status / {print $4}'; }
141 141
142openstack_image_id=$(openstack $auth image list --long | grep "cirros" | grep " bare " | head -1 | awk '{print $2}') 142openstack_image_id=$(openstack $auth image list --long | grep "cirros" | grep " ami " | head -1 | awk '{print $2}')
143if [[ -n "$openstack_image_id" ]]; then 143if [[ -n "$openstack_image_id" ]]; then
144 volume_id=$(cinder $auth create --image-id $openstack_image_id 1 | awk '/ id / {print $4}') 144 volume_id=$(cinder $auth create --image-id $openstack_image_id 1 | awk '/ id / {print $4}')
145 [[ -n "$volume_id" ]] || { echo "can't create volume for EBS image creation"; exit 1; } 145 [[ -n "$volume_id" ]] || { echo "can't create volume for EBS image creation"; exit 1; }