openstack
/
manila
Code Issues Proposed changes

Merge "[devstack][ci] Stop requiring g-reg service" into stable/ussuri

This commit is contained in:
Zuul 2020-05-20 06:32:36 +00:00 committed by Gerrit Code Review
parent 7196cfcb09 58105a2d68
commit b4cd3e596d
5 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
devstack/plugin.sh
View File

@ -435,14 +435,12 @@ function create_manila_service_flavor {
# create_manila_service_image - creates image, that will be used by backends
# with configured generic driver to boot Nova VMs from.
function create_manila_service_image {
if is_service_enabled nova; then
if is_service_enabled nova g-api; then
TOKEN=$(openstack token issue -c id -f value)
local image_exists=$( openstack image list | grep " $MANILA_SERVICE_IMAGE_NAME " )
if [[ -z $image_exists ]]; then
# Download Manila's image
if is_service_enabled g-reg; then
upload_image $MANILA_SERVICE_IMAGE_URL $TOKEN
fi
upload_image $MANILA_SERVICE_IMAGE_URL $TOKEN
fi
fi
}

2
doc/source/contributor/development-environment-devstack.rst
View File

@ -189,7 +189,7 @@ your testing::
Optionally, you can deploy with Manila, Nova, Neutron, Glance and Tempest::
ENABLED_SERVICES=key,mysql,rabbit,tempest,g-api,g-reg
ENABLED_SERVICES=key,mysql,rabbit,tempest,g-api
ENABLED_SERVICES+=n-api,n-cpu,n-cond,n-sch,n-crt,n-cauth,n-obj,placement-api,placement-client
ENABLED_SERVICES+=q-svc,q-dhcp,q-meta,q-l3,q-agt
ENABLED_SERVICES+=tempest

2
playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-nfs/run.yaml
View File

@ -73,7 +73,7 @@
# Basic services needed for minimal job
OVERRIDE_ENABLED_SERVICES=key,mysql,rabbit,tempest
# Enable glance for scenario tests
OVERRIDE_ENABLED_SERVICES+=,g-api,g-reg
OVERRIDE_ENABLED_SERVICES+=,g-api
# Enable nova for scenario tests
OVERRIDE_ENABLED_SERVICES+=,n-api,n-cpu,n-cond,n-sch,n-crt,n-cauth,n-obj
# Enable neutron for scenario tests

2
playbooks/legacy/manila-tempest-minimal-dsvm-lvm/run-ipv6.yaml
View File

@ -56,7 +56,7 @@
# Basic services needed for minimal job
OVERRIDE_ENABLED_SERVICES=key,mysql,rabbit,tempest
# Enable glance for scenario tests
OVERRIDE_ENABLED_SERVICES+=,g-api,g-reg
OVERRIDE_ENABLED_SERVICES+=,g-api
# Enable nova for scenario tests
OVERRIDE_ENABLED_SERVICES+=,n-api,n-cpu,n-cond,n-sch,n-crt,n-cauth,n-obj
# Enable neutron for scenario tests

2
playbooks/legacy/manila-tempest-minimal-dsvm-lvm/run.yaml
View File

@ -54,7 +54,7 @@
# Basic services needed for minimal job
OVERRIDE_ENABLED_SERVICES=key,mysql,rabbit,tempest
# Enable glance for scenario tests
OVERRIDE_ENABLED_SERVICES+=,g-api,g-reg
OVERRIDE_ENABLED_SERVICES+=,g-api
# Enable nova for scenario tests
OVERRIDE_ENABLED_SERVICES+=,n-api,n-cpu,n-cond,n-sch,n-crt,n-cauth,n-obj
# Enable neutron for scenario tests