diff --git a/.zuul.yaml b/.zuul.yaml
index bffc7e4a7..62055af46 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -67,7 +67,6 @@
     required-projects:
       - openstack-infra/glean
       - openstack-infra/nodepool
-      - openstack-infra/shade
       - openstack/diskimage-builder
       - openstack/openstacksdk
 
diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index d2e3da64c..2b7648baf 100644
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -20,24 +20,6 @@ NODEPOOL_PUBKEY=$HOME/.ssh/id_nodepool.pub
 NODEPOOL_INSTALL=$HOME/nodepool-venv
 NODEPOOL_CACHE_GET_PIP=/opt/stack/cache/files/get-pip.py
 
-# Install shade from git if requested. If not requested
-# nodepool install will pull it in.
-function install_shade {
-    if use_library_from_git "shade"; then
-        GITREPO["shade"]=$SHADE_REPO_URL
-        GITDIR["shade"]=$DEST/shade
-        GITBRANCH["shade"]=$SHADE_REPO_REF
-        git_clone_by_name "shade"
-        # Install shade globally, because the job config has LIBS_FROM_GIT
-        # and if we don't install it globally, all hell breaks loose
-        setup_dev_lib "shade"
-        # BUT - install shade into a virtualenv so that we don't have issues
-        # with OpenStack constraints affecting the shade dependency install.
-        # This particularly shows up with os-client-config
-        $NODEPOOL_INSTALL/bin/pip install $DEST/shade
-    fi
-}
-
 function install_diskimage_builder {
     if use_library_from_git "diskimage-builder"; then
         GITREPO["diskimage-builder"]=$DISKIMAGE_BUILDER_REPO_URL
@@ -65,7 +47,6 @@ function install_glean {
 function install_nodepool {
     VENV="virtualenv -p python3"
     $VENV $NODEPOOL_INSTALL
-    install_shade
     install_diskimage_builder
     install_glean
 
@@ -127,7 +108,7 @@ function nodepool_write_config {
 keys=simple
 
 [loggers]
-keys=root,nodepool,shade,kazoo,keystoneauth,novaclient
+keys=root,nodepool,openstack,kazoo,keystoneauth,novaclient
 
 [handlers]
 keys=console
@@ -142,10 +123,10 @@ handlers=console
 qualname=nodepool
 propagate=0
 
-[logger_shade]
+[logger_openstack]
 level=DEBUG
 handlers=console
-qualname=shade
+qualname=openstack
 propagate=0
 
 [logger_keystoneauth]
diff --git a/devstack/settings b/devstack/settings
index 485d4523c..fe169dc5e 100644
--- a/devstack/settings
+++ b/devstack/settings
@@ -17,9 +17,6 @@ NODEPOOL_PAUSE_OPENSUSE_150_DIB=${NODEPOOL_PAUSE_OPENSUSE_150_DIB:-true}
 NODEPOOL_PAUSE_OPENSUSE_TUMBLEWEED_DIB=${NODEPOOL_PAUSE_OPENSUSE_TUMBLEWEED_DIB:-true}
 NODEPOOL_PAUSE_GENTOO_17_0_SYSTEMD_DIB=${NODEPOOL_PAUSE_GENTOO_17_0_SYSTEMD_DIB:-true}
 
-SHADE_REPO_URL=${SHADE_REPO_URL:-https://git.openstack.org/openstack-infra/shade}
-SHADE_REPO_REF=${SHADE_REPO_REF:-master}
-
 DISKIMAGE_BUILDER_REPO_URL=${DISKIMAGE_BUILDER_REPO_URL:-https://git.openstack.org/openstack/diskimage-builder}
 DISKIMAGE_BUILDER_REPO_REF=${DISKIMAGE_BUILDER_REPO_REF:-master}
 
diff --git a/nodepool/driver/openstack/provider.py b/nodepool/driver/openstack/provider.py
index d8b916212..b1e4d3e1f 100755
--- a/nodepool/driver/openstack/provider.py
+++ b/nodepool/driver/openstack/provider.py
@@ -394,7 +394,7 @@ class OpenStackProvider(Provider):
         #  - v2 w/task waiting is very strange and complex - but we have to
         #              block for our v1 clouds anyway, so we might as well
         #              have the interface be the same and treat faking-out
-        #              a shade-level fake-async interface later
+        #              a openstacksdk-level fake-async interface later
         if not meta:
             meta = {}
         if image_type:
diff --git a/tools/logging.conf b/tools/logging.conf
index d87009ffd..991d1c94e 100644
--- a/tools/logging.conf
+++ b/tools/logging.conf
@@ -2,7 +2,7 @@
 keys=simple
 
 [loggers]
-keys=root,nodepool,shade
+keys=root,nodepool,openstack
 
 [handlers]
 keys=console
@@ -17,10 +17,10 @@ handlers=console
 qualname=nodepool
 propagate=0
 
-[logger_shade]
+[logger_openstack]
 level=DEBUG
 handlers=console
-qualname=shade
+qualname=openstack
 propagate=0
 
 [handler_console]
diff --git a/tools/zuul-nodepool-integration/builder-logging.conf b/tools/zuul-nodepool-integration/builder-logging.conf
index 1ac791f19..845509222 100644
--- a/tools/zuul-nodepool-integration/builder-logging.conf
+++ b/tools/zuul-nodepool-integration/builder-logging.conf
@@ -1,5 +1,5 @@
 [loggers]
-keys=root,nodepool,requests,shade
+keys=root,nodepool,requests,openstack
 
 [handlers]
 keys=console,normal
@@ -16,10 +16,10 @@ level=WARNING
 handlers=normal
 qualname=requests
 
-[logger_shade]
+[logger_openstack]
 level=WARNING
 handlers=normal
-qualname=shade
+qualname=openstack
 
 [logger_gear]
 level=DEBUG
diff --git a/tools/zuul-nodepool-integration/launcher-logging.conf b/tools/zuul-nodepool-integration/launcher-logging.conf
index e206606de..4c578ebce 100644
--- a/tools/zuul-nodepool-integration/launcher-logging.conf
+++ b/tools/zuul-nodepool-integration/launcher-logging.conf
@@ -1,5 +1,5 @@
 [loggers]
-keys=root,nodepool,requests,shade
+keys=root,nodepool,requests,openstack
 
 [handlers]
 keys=console,normal
@@ -16,10 +16,10 @@ level=WARNING
 handlers=normal
 qualname=requests
 
-[logger_shade]
+[logger_openstack]
 level=WARNING
 handlers=normal
-qualname=shade
+qualname=openstack
 
 [logger_gear]
 level=DEBUG