From 989dd9e495659522a2155c187407e26427014b6c Mon Sep 17 00:00:00 2001 From: Hongbin Lu Date: Tue, 18 Apr 2017 12:30:49 -0400 Subject: [PATCH] Make volume providers configurable in devstack Change-Id: I29d358ce96e64bb98a7a656975c3b7b1aa523202 --- devstack/local.conf.sample | 3 ++- devstack/plugin.sh | 2 +- devstack/settings | 1 + fuxi/tests/contrib/gate_hook.sh | 1 + 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/devstack/local.conf.sample b/devstack/local.conf.sample index ca93eb4..10d861c 100644 --- a/devstack/local.conf.sample +++ b/devstack/local.conf.sample @@ -18,5 +18,6 @@ MANILA_DEFAULT_SHARE_TYPE_EXTRA_SPECS='snapshot_support=True create_share_from_s SHARE_DRIVER=manila.share.drivers.lvm.LVMShareDriver MANILA_OPTGROUP_generic1_driver_handles_share_servers=False +FUXI_VOLUME_PROVIDERS=cinder,manila enable_plugin fuxi https://git.openstack.org/openstack/fuxi -enable_plugin manila https://github.com/openstack/manila +enable_plugin manila https://git.openstack.org/openstack/manila diff --git a/devstack/plugin.sh b/devstack/plugin.sh index 337f682..cc5768d 100644 --- a/devstack/plugin.sh +++ b/devstack/plugin.sh @@ -60,7 +60,7 @@ function configure_fuxi { iniset $FUXI_CONFIG DEFAULT fuxi_port 7879 iniset $FUXI_CONFIG DEFAULT my_ip $HOST_IP - iniset $FUXI_CONFIG DEFAULT volume_providers cinder,manila + iniset $FUXI_CONFIG DEFAULT volume_providers $FUXI_VOLUME_PROVIDERS iniset $FUXI_CONFIG DEFAULT volume_from fuxi iniset $FUXI_CONFIG DEFAULT default_volume_size 1 iniset $FUXI_CONFIG DEFAULT volume_dir /fuxi/data diff --git a/devstack/settings b/devstack/settings index 39bd30c..e4f9af6 100644 --- a/devstack/settings +++ b/devstack/settings @@ -16,6 +16,7 @@ FUXI_AUTH_CACHE_DIR=${FUXI_AUTH_CACHE_DIR:-/var/cache/fuxi} FUXI_DOCKER_ENGINE_PORT=${FUXI_DOCKER_ENGINE_PORT:-2375} FUXI_DOCKER_ENGINE_SOCKET_FILE=${FUXI_DOCKER_ENGINE_SOCKET_FILE:-/var/run/docker.sock} FUXI_ETCD_PORT=${FUXI_ETCD_PORT:-4001} +FUXI_VOLUME_PROVIDERS=${FUXI_VOLUME_PROVIDERS:-cinder,manila} GITREPO["kuryr"]=${KURYR_REPO:-${GIT_BASE}/openstack/kuryr.git} GITBRANCH["kuryr"]=${KURYR_BRANCH:-master} diff --git a/fuxi/tests/contrib/gate_hook.sh b/fuxi/tests/contrib/gate_hook.sh index 0a2c3ce..ad51a59 100644 --- a/fuxi/tests/contrib/gate_hook.sh +++ b/fuxi/tests/contrib/gate_hook.sh @@ -11,5 +11,6 @@ export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin manila git://git.openstack.org export DEVSTACK_LOCAL_CONFIG+=$'\n'"MANILA_DEFAULT_SHARE_TYPE_EXTRA_SPECS='snapshot_support=True create_share_from_snapshot_support=True revert_to_snapshot_support=True mount_snapshot_support=True'" export DEVSTACK_LOCAL_CONFIG+=$'\n'"SHARE_DRIVER=manila.share.drivers.lvm.LVMShareDriver" export DEVSTACK_LOCAL_CONFIG+=$'\n'"MANILA_OPTGROUP_generic1_driver_handles_share_servers=False" +export DEVSTACK_LOCAL_CONFIG+=$'\n'"FUXI_VOLUME_PROVIDERS=cinder,manila" $BASE/new/devstack-gate/devstack-vm-gate.sh