diff --git a/devstack/localrc.py2.sample b/devstack/localrc.py2.sample new file mode 100644 index 00000000..1869a075 --- /dev/null +++ b/devstack/localrc.py2.sample @@ -0,0 +1,18 @@ +ENABLE_HTTPD_MOD_WSGI_SERVICES=False +ENABLED_SERVICES=key,swift,mysql +# We need stable/train keystone to run it on python2 +KEYSTONE_BRANCH=stable/train +HOST_IP=127.0.0.1 +ADMIN_PASSWORD=admin +MYSQL_PASSWORD=$ADMIN_PASSWORD +RABBIT_PASSWORD=$ADMIN_PASSWORD +SERVICE_PASSWORD=$ADMIN_PASSWORD +SWIFT_SERVICE_PROTOCOL=${SWIFT_SERVICE_PROTOCOL:-http} +SWIFT_DEFAULT_BIND_PORT=${SWIFT_DEFAULT_BIND_PORT:-8080} +# service local host is used for ring building +SWIFT_SERVICE_LOCAL_HOST=$HOST_IP +# service listen address for prox +SWIFT_SERVICE_LISTEN_ADDRESS=$HOST_IP +SWIFT_LOOPBACK_DISK_SIZE=20G +SWIFT_MAX_FILE_SIZE=5368709122 +SWIFT_HASH=1234567890 diff --git a/s2aio.sh b/s2aio.sh index 45f7054d..f6cdb34d 100755 --- a/s2aio.sh +++ b/s2aio.sh @@ -34,7 +34,11 @@ _prepare_devstack_env() { # Checkout devstack if [ ! -e $DEVSTACK_DIR ]; then git clone git://github.com/openstack-dev/devstack.git $DEVSTACK_DIR - cp devstack/localrc.sample $DEVSTACK_DIR/localrc + if [ ${USE_PYTHON3} == "False" ]; then + cp devstack/localrc.py2.sample $DEVSTACK_DIR/localrc + else + cp devstack/localrc.sample $DEVSTACK_DIR/localrc + fi fi source $DEVSTACK_DIR/stackrc