[devstack][ci] Stop requiring g-reg service
When using manila's devstack plugin, we pull down the latest manila testing image created with the manila-image-elements project, and upload it to the stack's Glance/Image service. Glance's V2 API no longer needs g-reg which was a legacy database proxy service for the older glance API. Our devstack plugin should not have a hard dependency on this service. [1] http://lists.openstack.org/pipermail/openstack-dev/2016-May/094773.html [2] https://specs.openstack.org/openstack/glance-specs/specs/newton/approved/glance/deprecate-registry.html Change-Id: I58603032fb215ac0be2f76c8cd9fbce775be41dd Closes-Bug: #1859847
This commit is contained in:
parent
67fe72f563
commit
ffb283a04a
@ -435,16 +435,14 @@ 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
|
||||
fi
|
||||
fi
|
||||
}
|
||||
|
||||
# create_manila_service_secgroup - creates security group that is used by
|
||||
|
@ -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
|
||||
|
@ -72,7 +72,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
|
||||
|
@ -55,7 +55,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
|
||||
|
@ -53,7 +53,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
|
||||
|
Loading…
Reference in New Issue
Block a user