From 58105a2d68a3530d13f262b9604500eab3a3c941 Mon Sep 17 00:00:00 2001 From: Goutham Pacha Ravi Date: Tue, 28 Apr 2020 16:41:00 -0700 Subject: [PATCH] [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 (cherry picked from commit ffb283a04a27d87ff7f9c74ead7778efb68b0255) --- devstack/plugin.sh | 6 ++---- doc/source/contributor/development-environment-devstack.rst | 2 +- .../legacy/manila-tempest-minimal-dsvm-cephfs-nfs/run.yaml | 2 +- .../legacy/manila-tempest-minimal-dsvm-lvm/run-ipv6.yaml | 2 +- playbooks/legacy/manila-tempest-minimal-dsvm-lvm/run.yaml | 2 +- 5 files changed, 6 insertions(+), 8 deletions(-) diff --git a/devstack/plugin.sh b/devstack/plugin.sh index e93ee3d40d..05d3f0b7d2 100755 --- a/devstack/plugin.sh +++ b/devstack/plugin.sh @@ -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 } diff --git a/doc/source/contributor/development-environment-devstack.rst b/doc/source/contributor/development-environment-devstack.rst index 0f94021480..7b32080d91 100644 --- a/doc/source/contributor/development-environment-devstack.rst +++ b/doc/source/contributor/development-environment-devstack.rst @@ -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 diff --git a/playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-nfs/run.yaml b/playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-nfs/run.yaml index 8ce783ff84..8dc3834e7b 100644 --- a/playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-nfs/run.yaml +++ b/playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-nfs/run.yaml @@ -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 diff --git a/playbooks/legacy/manila-tempest-minimal-dsvm-lvm/run-ipv6.yaml b/playbooks/legacy/manila-tempest-minimal-dsvm-lvm/run-ipv6.yaml index acbc3bc00f..9f6745d2e4 100644 --- a/playbooks/legacy/manila-tempest-minimal-dsvm-lvm/run-ipv6.yaml +++ b/playbooks/legacy/manila-tempest-minimal-dsvm-lvm/run-ipv6.yaml @@ -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 diff --git a/playbooks/legacy/manila-tempest-minimal-dsvm-lvm/run.yaml b/playbooks/legacy/manila-tempest-minimal-dsvm-lvm/run.yaml index 4f423586dc..5664f4713a 100644 --- a/playbooks/legacy/manila-tempest-minimal-dsvm-lvm/run.yaml +++ b/playbooks/legacy/manila-tempest-minimal-dsvm-lvm/run.yaml @@ -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