openstack/fuxi
Code Issues Proposed changes

Merge "Make volume providers configurable in devstack"

Browse Source
This commit is contained in:
Jenkins 2017-04-24 19:57:36 +00:00 committed by Gerrit Code Review
commit aebd31d7eb
4 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
devstack/local.conf.sample
View File

@ -18,5 +18,6 @@ MANILA_DEFAULT_SHARE_TYPE_EXTRA_SPECS='snapshot_support=True create_share_from_s
SHARE_DRIVER=manila.share.drivers.lvm.LVMShareDriver SHARE_DRIVER=manila.share.drivers.lvm.LVMShareDriver
MANILA_OPTGROUP_generic1_driver_handles_share_servers=False MANILA_OPTGROUP_generic1_driver_handles_share_servers=False
FUXI_VOLUME_PROVIDERS=cinder,manila
enable_plugin fuxi https://git.openstack.org/openstack/fuxi 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

2
devstack/plugin.sh
View File

@ -60,7 +60,7 @@ function configure_fuxi {
iniset $FUXI_CONFIG DEFAULT fuxi_port 7879 iniset $FUXI_CONFIG DEFAULT fuxi_port 7879
iniset $FUXI_CONFIG DEFAULT my_ip $HOST_IP 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 volume_from fuxi
iniset $FUXI_CONFIG DEFAULT default_volume_size 1 iniset $FUXI_CONFIG DEFAULT default_volume_size 1
iniset $FUXI_CONFIG DEFAULT volume_dir /fuxi/data iniset $FUXI_CONFIG DEFAULT volume_dir /fuxi/data

1
devstack/settings
View File

@ -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_PORT=${FUXI_DOCKER_ENGINE_PORT:-2375}
FUXI_DOCKER_ENGINE_SOCKET_FILE=${FUXI_DOCKER_ENGINE_SOCKET_FILE:-/var/run/docker.sock} FUXI_DOCKER_ENGINE_SOCKET_FILE=${FUXI_DOCKER_ENGINE_SOCKET_FILE:-/var/run/docker.sock}
FUXI_ETCD_PORT=${FUXI_ETCD_PORT:-4001} FUXI_ETCD_PORT=${FUXI_ETCD_PORT:-4001}
FUXI_VOLUME_PROVIDERS=${FUXI_VOLUME_PROVIDERS:-cinder,manila}
GITREPO["kuryr"]=${KURYR_REPO:-${GIT_BASE}/openstack/kuryr.git} GITREPO["kuryr"]=${KURYR_REPO:-${GIT_BASE}/openstack/kuryr.git}
GITBRANCH["kuryr"]=${KURYR_BRANCH:-master} GITBRANCH["kuryr"]=${KURYR_BRANCH:-master}

1
fuxi/tests/contrib/gate_hook.sh
View File

@ -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'"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'"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'"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 $BASE/new/devstack-gate/devstack-vm-gate.sh