diff --git a/manifests/site.pp b/manifests/site.pp
index a8ec944626..2cb46db8d1 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -786,37 +786,10 @@ node 'nodepool.openstack.org' {
 # Node-OS: xenial
 node /^nl\d+\.openstack\.org$/ {
   $group = 'nodepool'
-  # TODO(pabelanger): Move all of this back into nodepool manifest, it has
-  # grown too big.
-  $rackspace_username             = hiera('nodepool_rackspace_username', 'username')
-  $rackspace_password             = hiera('nodepool_rackspace_password')
-  $rackspace_project              = hiera('nodepool_rackspace_project', 'project')
-  $hpcloud_username               = hiera('nodepool_hpcloud_username', 'username')
-  $hpcloud_password               = hiera('nodepool_hpcloud_password')
-  $hpcloud_project                = hiera('nodepool_hpcloud_project', 'project')
-  $internap_username              = hiera('nodepool_internap_username', 'username')
-  $internap_password              = hiera('nodepool_internap_password')
-  $internap_project               = hiera('nodepool_internap_project', 'project')
-  $ovh_username                   = hiera('nodepool_ovh_username', 'username')
-  $ovh_password                   = hiera('nodepool_ovh_password')
-  $ovh_project                    = hiera('nodepool_ovh_project', 'project')
-  $tripleo_username               = hiera('nodepool_tripleo_username', 'username')
-  $tripleo_password               = hiera('nodepool_tripleo_password')
-  $tripleo_project                = hiera('nodepool_tripleo_project', 'project')
-  $vexxhost_username              = hiera('nodepool_vexxhost_username', 'username')
-  $vexxhost_password              = hiera('nodepool_vexxhost_password')
-  $vexxhost_project               = hiera('nodepool_vexxhost_project', 'project')
-  $citycloud_username             = hiera('nodepool_citycloud_username', 'username')
-  $citycloud_password             = hiera('nodepool_citycloud_password')
-  $linaro_username                = hiera('nodepool_linaro_username', 'username')
-  $linaro_password                = hiera('nodepool_linaro_password')
-  $linaro_project                 = hiera('nodepool_linaro_project', 'project')
-  $limestone_username             = hiera('nodepool_limestone_username', 'username')
-  $limestone_password             = hiera('nodepool_limestone_password')
-  $limestone_project              = hiera('nodepool_limestone_project', 'project')
-  $packethost_username            = hiera('nodepool_packethost_username', 'username')
-  $packethost_password            = hiera('nodepool_packethost_password')
-  $packethost_project             = hiera('nodepool_packethost_project', 'project')
+
+  # NOTE(ianw) From 09-2018 (https://review.openstack.org/#/c/598329/)
+  # the cloud credentials are deployed with ansible via the
+  # configure-openstacksdk role and are no longer configured here
 
   class { 'openstack_project::server': }
 
@@ -835,37 +808,6 @@ node /^nl\d+\.openstack\.org$/ {
 # Node-OS: xenial
 node /^nb\d+\.openstack\.org$/ {
   $group = 'nodepool'
-  # TODO(pabelanger): Move all of this back into nodepool manifest, it has
-  # grown too big.
-  $rackspace_username            = hiera('nodepool_rackspace_username', 'username')
-  $rackspace_password            = hiera('nodepool_rackspace_password')
-  $rackspace_project             = hiera('nodepool_rackspace_project', 'project')
-  $hpcloud_username              = hiera('nodepool_hpcloud_username', 'username')
-  $hpcloud_password              = hiera('nodepool_hpcloud_password')
-  $hpcloud_project               = hiera('nodepool_hpcloud_project', 'project')
-  $internap_username             = hiera('nodepool_internap_username', 'username')
-  $internap_password             = hiera('nodepool_internap_password')
-  $internap_project              = hiera('nodepool_internap_project', 'project')
-  $ovh_username                  = hiera('nodepool_ovh_username', 'username')
-  $ovh_password                  = hiera('nodepool_ovh_password')
-  $ovh_project                   = hiera('nodepool_ovh_project', 'project')
-  $tripleo_username              = hiera('nodepool_tripleo_username', 'username')
-  $tripleo_password              = hiera('nodepool_tripleo_password')
-  $tripleo_project               = hiera('nodepool_tripleo_project', 'project')
-  $vexxhost_username             = hiera('nodepool_vexxhost_username', 'username')
-  $vexxhost_password             = hiera('nodepool_vexxhost_password')
-  $vexxhost_project              = hiera('nodepool_vexxhost_project', 'project')
-  $citycloud_username            = hiera('nodepool_citycloud_username', 'username')
-  $citycloud_password            = hiera('nodepool_citycloud_password')
-  $linaro_username               = hiera('nodepool_linaro_username', 'username')
-  $linaro_password               = hiera('nodepool_linaro_password')
-  $linaro_project                = hiera('nodepool_linaro_project', 'project')
-  $limestone_username            = hiera('nodepool_limestone_username', 'username')
-  $limestone_password            = hiera('nodepool_limestone_password')
-  $limestone_project             = hiera('nodepool_limestone_project', 'project')
-  $packethost_username            = hiera('nodepool_packethost_username', 'username')
-  $packethost_password            = hiera('nodepool_packethost_password')
-  $packethost_project             = hiera('nodepool_packethost_project', 'project')
 
   class { 'openstack_project::server': }