aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xdeploy-devstack2
-rw-r--r--devstack-local.conf13
2 files changed, 3 insertions, 12 deletions
diff --git a/deploy-devstack b/deploy-devstack
index cdd044a..ee140be 100755
--- a/deploy-devstack
+++ b/deploy-devstack
@@ -4,6 +4,8 @@ sudo apt-get install cloud-image-utils
rm -rf devstack
+export GIT_DEPTH=1
+
git clone https://git.openstack.org/openstack-dev/devstack
pushd devstack
diff --git a/devstack-local.conf b/devstack-local.conf
index dcc1add..861d4c4 100644
--- a/devstack-local.conf
+++ b/devstack-local.conf
@@ -3,7 +3,7 @@ SCREEN_LOGDIR=/opt/stack/log
VERBOSE=True
RECLONE=yes
-DISABLE_PROGRESS_SPINNER=True
+LIBVIRT_TYPE=xen
DATABASE_PASSWORD=password
MYSQL_PASSWORD=password
@@ -18,16 +18,10 @@ SWIFT_HASH=66a3d6b56c1f479c8b4e70ab5c2000f5
# hotpluggable block device on arm64 yet (see
# https://cards.linaro.org/browse/CARD-1270)
ENABLED_SERVICES=g-api,g-reg,key,n-api,n-crt,n-obj,n-cpu,n-net,n-cond,n-sch,n-cauth,horizon,rabbit,tempest,mysql,s-proxy,s-object,s-container,s-account,c-sch,c-api,c-vol
-#enable_service swift
-#disable_service n-novnc
-#disable_service n-xvnc
-#enable_service s-proxy
-#enable_service g-api
SWIFT_REPLICAS=1
SWIFT_DATA_DIR=$DEST/data/swift
-#IMAGE_URLS=http://people.linaro.org/~mwhudson/linaro-minimal-arm64-uec-psci.tar.gz
IMAGE_URLS=http://cloud-images.ubuntu.com/trusty/current/trusty-server-cloudimg-arm64.tar.gz
LOGFILE=$DEST/log/stack.sh.log
@@ -53,13 +47,8 @@ TEMPEST_HTTP_IMAGE=http://127.0.0.1/static/dashboard/img/favicon.ico
[[post-config|$NOVA_CONF]]
[DEFAULT]
-# Not sure of the status of these flags, we should see if we can make
-# them defaults or otherwise unnecessary on arm64.
-libvirt_disk_prefix = xvd
-libvirt_use_virtio_for_bridges = False
vnc_enabled = False
[libvirt]
-virt_type=xen
images_type=raw
[[post-extra|$TEMPEST_CONFIG]]