From bfea3f42a8391e58841ef9053bf4cb9901b559ad Mon Sep 17 00:00:00 2001
From: Ben Swartzlander <ben@swartzlander.org>
Date: Fri, 4 Mar 2016 11:19:57 -0500
Subject: [PATCH] Use official location for service image
Download manila service image from official tarballs site
instead of github.
Change-Id: I391119cf08949974efc469b8669d5e4120170c0d
Closes-Bug: 1553259
---
devstack/settings | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/devstack/settings b/devstack/settings
index 173c9cee2c..251c4a6379 100644
--- a/devstack/settings
+++ b/devstack/settings
@@ -100,8 +100,8 @@ MANILA_PATH_TO_PRIVATE_KEY=${MANILA_PATH_TO_PRIVATE_KEY:-"$USER_HOME/.ssh/id_rsa
MANILA_SERVICE_KEYPAIR_NAME=${MANILA_SERVICE_KEYPAIR_NAME:-"manila-service"}
MANILA_SERVICE_INSTANCE_USER=${MANILA_SERVICE_INSTANCE_USER:-"manila"}
-MANILA_SERVICE_IMAGE_URL=${MANILA_SERVICE_IMAGE_URL:-"https://github.com/uglide/manila-image-elements/releases/download/0.1.0/manila-service-image.qcow2"}
-MANILA_SERVICE_IMAGE_NAME=${MANILA_SERVICE_IMAGE_NAME:-"manila-service-image"}
+MANILA_SERVICE_IMAGE_URL=${MANILA_SERVICE_IMAGE_URL:-"http://tarballs.openstack.org/manila-image-elements/images/manila-service-image-master.qcow2"}
+MANILA_SERVICE_IMAGE_NAME=${MANILA_SERVICE_IMAGE_NAME:-"manila-service-image-master"}
# Third party CI Vendors should set this to false to skip the service image download
MANILA_SERVICE_IMAGE_ENABLED=$(trueorfalse True MANILA_SERVICE_IMAGE_ENABLED)