diff --git a/doc/source/nodepool.rst b/doc/source/nodepool.rst
index f2560d21dd..66f41eca2a 100644
--- a/doc/source/nodepool.rst
+++ b/doc/source/nodepool.rst
@@ -14,11 +14,10 @@ At a Glance
 :Hosts:
   * nodepool.openstack.org
 :Puppet:
-  * https://git.openstack.org/cgit/openstack-infra/puppet-nodepool/tree/
-  * :file:`modules/openstack_project/manifests/nodepool_prod.pp`
+  * https://git.openstack.org/cgit/openstack-infra/puppet-openstackci/tree/manifests/nodepool.pp
   * :file:`modules/openstack_project/manifests/single_use_slave.pp`
 :Configuration:
-  * :file:`modules/openstack_project/templates/nodepool/nodepool.yaml.erb`
+  * :config:`nodepool/nodepool.yaml`
   * :config:`nodepool/scripts/`
   * :config:`nodepool/elements/`
 :Projects:
diff --git a/manifests/site.pp b/manifests/site.pp
index d3e934d27d..8719ef3172 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -647,17 +647,34 @@ node 'status.openstack.org' {
 
 # Node-OS: trusty
 node 'nodepool.openstack.org' {
+  $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')
+  $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')
+  $clouds_yaml          = template("openstack_project/nodepool/clouds.yaml.erb")
   class { 'openstack_project::server':
     sysadmins                 => hiera('sysadmins', []),
     iptables_public_tcp_ports => [80],
   }
 
-  class { 'openstack_project::nodepool_prod':
+  class { '::openstackci::nodepool':
+    vhost_name               => 'nodepool.openstack.org',
     project_config_repo      => 'https://git.openstack.org/openstack-infra/project-config',
     mysql_password           => hiera('nodepool_mysql_password'),
     mysql_root_password      => hiera('nodepool_mysql_root_password'),
     nodepool_ssh_private_key => hiera('jenkins_ssh_private_key_contents'),
+    oscc_file_contents       => $clouds_yaml,
+    image_log_document_root  => '/var/log/nodepool/image',
     statsd_host              => 'graphite.openstack.org',
+    logging_conf_template    => 'openstack_project/nodepool/nodepool.logging.conf.erb',
     jenkins_masters          => [
       {
         name        => 'jenkins01',
@@ -709,18 +726,6 @@ node 'nodepool.openstack.org' {
         credentials => hiera('jenkins_credentials_id'),
       },
     ],
-    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'),
-    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'),
   }
 }
 
diff --git a/modules/openstack_project/manifests/nodepool_prod.pp b/modules/openstack_project/manifests/nodepool_prod.pp
deleted file mode 100644
index 8a76aecab0..0000000000
--- a/modules/openstack_project/manifests/nodepool_prod.pp
+++ /dev/null
@@ -1,89 +0,0 @@
-# == Class: openstack_project::nodepool_prod
-#
-class openstack_project::nodepool_prod(
-  $mysql_root_password,
-  $mysql_password,
-  $nodepool_ssh_private_key = '',
-  $nodepool_template = 'openstack_project/nodepool/nodepool.yaml.erb',
-  $nodepool_logging_template = 'openstack_project/nodepool/nodepool.logging.conf.erb',
-  $vhost_name = 'nodepool.openstack.org',
-  $statsd_host = '',
-  $jenkins_masters = [],
-  $rackspace_username ='',
-  $rackspace_password ='',
-  $rackspace_project ='',
-  $hpcloud_username ='',
-  $hpcloud_password ='',
-  $hpcloud_project ='',
-  $ovh_username ='',
-  $ovh_password ='',
-  $ovh_project ='',
-  $tripleo_username ='',
-  $tripleo_password ='',
-  $tripleo_project ='',
-  $image_log_document_root = '/var/log/nodepool/image',
-  $enable_image_log_via_http = true,
-  $project_config_repo = '',
-  $clouds_yaml_template = 'openstack_project/nodepool/clouds.yaml.erb',
-) {
-  class { 'project_config':
-    url  => $project_config_repo,
-  }
-
-  class { '::nodepool':
-    mysql_root_password       => $mysql_root_password,
-    mysql_password            => $mysql_password,
-    nodepool_ssh_private_key  => $nodepool_ssh_private_key,
-    vhost_name                => $vhost_name,
-    statsd_host               => $statsd_host,
-    image_log_document_root   => $image_log_document_root,
-    enable_image_log_via_http => $enable_image_log_via_http,
-    scripts_dir               => $::project_config::nodepool_scripts_dir,
-    elements_dir              => $::project_config::nodepool_elements_dir,
-    require                   => $::project_config::config_dir,
-    logging_conf_template     => $nodepool_logging_template,
-    jenkins_masters           => $jenkins_masters,
-  }
-
-  file { '/etc/nodepool/nodepool.yaml':
-    ensure  => present,
-    owner   => 'nodepool',
-    group   => 'root',
-    mode    => '0400',
-    content => template($nodepool_template),
-    require => [
-      File['/etc/nodepool'],
-      User['nodepool'],
-    ],
-  }
-
-  file { '/home/nodepool/.config':
-    ensure => directory,
-    owner   => 'nodepool',
-    group   => 'nodepool',
-    require => [
-      User['nodepool'],
-    ],
-  }
-
-  file { '/home/nodepool/.config/openstack':
-    ensure => directory,
-    owner   => 'nodepool',
-    group   => 'nodepool',
-    require => [
-      File['/home/nodepool/.config'],
-    ],
-  }
-
-  file { '/home/nodepool/.config/openstack/clouds.yaml':
-    ensure  => present,
-    owner   => 'nodepool',
-    group   => 'nodepool',
-    mode    => '0400',
-    content => template($clouds_yaml_template),
-    require => [
-      File['/home/nodepool/.config/openstack'],
-      User['nodepool'],
-    ],
-  }
-}
diff --git a/modules/openstack_project/templates/nodepool/nodepool.yaml.erb b/modules/openstack_project/templates/nodepool/nodepool.yaml.erb
deleted file mode 100644
index cf3fa940e6..0000000000
--- a/modules/openstack_project/templates/nodepool/nodepool.yaml.erb
+++ /dev/null
@@ -1,1137 +0,0 @@
-script-dir: /etc/nodepool/scripts
-elements-dir: /etc/nodepool/elements
-images-dir: /opt/nodepool_dib
-
-cron:
-  cleanup: '*/1 * * * *'
-  check: '*/15 * * * *'
-  image-update: '14 14 * * *'
-
-zmq-publishers:
-  - tcp://jenkins01.openstack.org:8888
-  - tcp://jenkins02.openstack.org:8888
-  - tcp://jenkins03.openstack.org:8888
-  - tcp://jenkins04.openstack.org:8888
-  - tcp://jenkins05.openstack.org:8888
-  - tcp://jenkins06.openstack.org:8888
-  - tcp://jenkins07.openstack.org:8888
-
-gearman-servers:
-  - host: zuul.openstack.org
-
-labels:
-  - name: devstack-precise
-    image: devstack-precise
-    ready-script: configure_mirror.sh
-    min-ready: 1
-    providers:
-      - name: hpcloud-b1
-      - name: hpcloud-b2
-      - name: hpcloud-b3
-      - name: hpcloud-b4
-      - name: hpcloud-b5
-      - name: rax-dfw
-      - name: rax-ord
-      - name: rax-iad
-      - name: ovh-gra1
-  - name: devstack-precise-check
-    image: devstack-precise-check
-    min-ready: 0
-    providers:
-      - name: rax-iad
-  - name: bare-precise
-    image: bare-precise
-    ready-script: configure_mirror.sh
-    min-ready: 1
-    providers:
-      - name: hpcloud-b1
-      - name: hpcloud-b2
-      - name: hpcloud-b3
-      - name: hpcloud-b4
-      - name: hpcloud-b5
-      - name: rax-dfw
-      - name: rax-ord
-      - name: rax-iad
-  - name: devstack-trusty
-    image: devstack-trusty
-    ready-script: configure_mirror.sh
-    min-ready: 20
-    providers:
-      - name: hpcloud-b1
-      - name: hpcloud-b2
-      - name: hpcloud-b3
-      - name: hpcloud-b4
-      - name: hpcloud-b5
-      - name: rax-dfw
-      - name: rax-ord
-      - name: rax-iad
-      - name: ovh-gra1
-  # Special dib specific labels for testing dib based images
-  # in new providers as we dibify them.
-  - name: devstack-trusty-dib
-    image: devstack-trusty-dib
-    ready-script: configure_mirror.sh
-    min-ready: 0
-    providers: []
-  - name: devstack-precise-dib
-    image: devstack-precise-dib
-    ready-script: configure_mirror.sh
-    min-ready: 0
-    providers: []
-  - name: bare-trusty
-    image: bare-trusty
-    ready-script: configure_mirror.sh
-    min-ready: 8
-    providers:
-      - name: hpcloud-b1
-      - name: hpcloud-b2
-      - name: hpcloud-b3
-      - name: hpcloud-b4
-      - name: hpcloud-b5
-      - name: rax-dfw
-      - name: rax-ord
-      - name: rax-iad
-  - name: bare-centos6
-    image: bare-centos6
-    ready-script: configure_mirror.sh
-    min-ready: 2
-    providers:
-      - name: hpcloud-b1
-      - name: hpcloud-b2
-      - name: hpcloud-b3
-      - name: hpcloud-b4
-      - name: hpcloud-b5
-      - name: rax-dfw
-      - name: rax-ord
-      - name: rax-iad
-  - name: centos-6
-    image: centos-6
-    ready-script: configure_mirror.sh
-    min-ready: 1
-    providers:
-      - name: hpcloud-b1
-      - name: hpcloud-b2
-      - name: hpcloud-b3
-      - name: hpcloud-b4
-      - name: hpcloud-b5
-      - name: rax-dfw
-      - name: rax-ord
-      - name: rax-iad
-      - name: ovh-gra1
-  - name: ubuntu-trusty
-    image: ubuntu-trusty
-    ready-script: configure_mirror.sh
-    min-ready: 1
-    providers:
-      - name: hpcloud-b1
-      - name: hpcloud-b2
-      - name: hpcloud-b3
-      - name: hpcloud-b4
-      - name: hpcloud-b5
-      - name: rax-dfw
-      - name: rax-ord
-      - name: rax-iad
-      - name: ovh-gra1
-  - name: ubuntu-trusty-check
-    image: ubuntu-trusty-check
-    min-ready: 1
-    providers:
-      - name: ovh-gra1
-  - name: ubuntu-trusty-2-node
-    image: ubuntu-trusty
-    ready-script: multinode_setup.sh
-    subnodes: 1
-    min-ready: 1
-    providers:
-      - name: rax-dfw
-      - name: rax-ord
-      - name: rax-iad
-      - name: hpcloud-b1
-      - name: hpcloud-b2
-      - name: hpcloud-b3
-      - name: hpcloud-b4
-      - name: hpcloud-b5
-      - name: ovh-gra1
-  - name: devstack-trusty-2-node
-    image: devstack-trusty
-    ready-script: multinode_setup.sh
-    subnodes: 1
-    min-ready: 1
-    providers:
-      - name: rax-dfw
-      - name: rax-ord
-      - name: rax-iad
-      - name: hpcloud-b1
-      - name: hpcloud-b2
-      - name: hpcloud-b3
-      - name: hpcloud-b4
-      - name: hpcloud-b5
-      - name: ovh-gra1
-  - name: devstack-precise-2-node
-    image: devstack-precise
-    ready-script: multinode_setup.sh
-    subnodes: 1
-    min-ready: 0
-    providers:
-      - name: rax-dfw
-      - name: rax-ord
-      - name: rax-iad
-      - name: hpcloud-b1
-      - name: hpcloud-b2
-      - name: hpcloud-b3
-      - name: hpcloud-b4
-      - name: hpcloud-b5
-  - name: devstack-f21
-    image: devstack-f21
-    ready-script: configure_mirror.sh
-    min-ready: 1
-    providers:
-      - name: rax-dfw
-      - name: rax-ord
-      - name: rax-iad
-      - name: hpcloud-b1
-      - name: hpcloud-b2
-      - name: hpcloud-b3
-      - name: hpcloud-b4
-      - name: hpcloud-b5
-  - name: devstack-centos7
-    image: devstack-centos7
-    ready-script: configure_mirror.sh
-    min-ready: 1
-    providers:
-      - name: rax-dfw
-      - name: rax-ord
-      - name: rax-iad
-      - name: hpcloud-b1
-      - name: hpcloud-b2
-      - name: hpcloud-b3
-      - name: hpcloud-b4
-      - name: hpcloud-b5
-  - name: devstack-centos7-dib
-    image: devstack-centos7-dib
-    ready-script: configure_mirror.sh
-    min-ready: 1
-    providers:
-      - name: hpcloud-b1
-      - name: hpcloud-b2
-      - name: hpcloud-b3
-      - name: hpcloud-b4
-      - name: hpcloud-b5
-  - name: devstack-fedora21-dib
-    image: devstack-fedora21-dib
-    ready-script: configure_mirror.sh
-    min-ready: 1
-    providers:
-      - name: hpcloud-b1
-      - name: hpcloud-b2
-      - name: hpcloud-b3
-      - name: hpcloud-b4
-      - name: hpcloud-b5
-  - name: fedora-22
-    image: fedora-22
-    ready-script: configure_mirror.sh
-    min-ready: 1
-    providers:
-      - name: rax-dfw
-      - name: rax-ord
-      - name: rax-iad
-      - name: hpcloud-b1
-      - name: hpcloud-b2
-      - name: hpcloud-b3
-      - name: hpcloud-b4
-      - name: hpcloud-b5
-  - name: tripleo-f21
-    image: tripleo-f21
-    min-ready: 16
-    providers:
-      - name: tripleo-test-cloud-rh1
-  - name: tripleo-f22
-    image: tripleo-f22
-    min-ready: 3
-    providers:
-      - name: tripleo-test-cloud-rh1
-providers:
-  - name: rax-dfw
-    region-name: 'DFW'
-    cloud: rax
-    api-timeout: 60
-    boot-timeout: 120
-    max-servers: 184
-    rate: 0.001
-    image-type: vhd
-    images:
-      - name: devstack-precise
-        base-image: 'Ubuntu 12.04 LTS (Precise Pangolin) (PVHVM)'
-        min-ram: 8192
-        name-filter: 'Performance'
-        setup: prepare_node_devstack.sh
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
-      - name: bare-precise
-        base-image: 'Ubuntu 12.04 LTS (Precise Pangolin) (PVHVM)'
-        min-ram: 8192
-        name-filter: 'Performance'
-        setup: prepare_node_bare.sh
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
-      - name: devstack-trusty
-        base-image: 'Ubuntu 14.04 LTS (Trusty Tahr) (PVHVM)'
-        min-ram: 8192
-        name-filter: 'Performance'
-        setup: prepare_node_devstack.sh
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
-      - name: bare-trusty
-        base-image: 'Ubuntu 14.04 LTS (Trusty Tahr) (PVHVM)'
-        min-ram: 8192
-        name-filter: 'Performance'
-        setup: prepare_node_bare.sh
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
-      - name: bare-centos6
-        base-image: 'CentOS 6 (PVHVM)'
-        min-ram: 8192
-        name-filter: 'Performance'
-        setup: prepare_node_bare.sh
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
-      - name: centos-6
-        base-image: 'CentOS 6 (PVHVM)'
-        min-ram: 8192
-        name-filter: 'Performance'
-        setup: prepare_node_devstack.sh
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
-      - name: ubuntu-trusty
-        min-ram: 8192
-        diskimage: ubuntu-trusty
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
-        name-filter: 'Performance'
-        config-drive: true
-        meta:
-          vm_mode: hvm
-          xenapi_use_agent: 'false'
-      - name: devstack-f21
-        base-image: 'Fedora 21 (PVHVM)'
-        min-ram: 8192
-        name-filter: 'Performance'
-        setup: prepare_node_devstack.sh
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
-      - name: fedora-22
-        min-ram: 8192
-        diskimage: fedora-22
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
-        config-drive: true
-      - name: devstack-centos7
-        base-image: 'CentOS 7 (PVHVM)'
-        min-ram: 8192
-        name-filter: 'Performance'
-        setup: prepare_node_devstack.sh
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
-  - name: rax-ord
-    region-name: 'ORD'
-    cloud: rax
-    api-timeout: 60
-    boot-timeout: 120
-    max-servers: 55
-    rate: 0.001
-    image-type: vhd
-    images:
-      - name: devstack-precise
-        base-image: 'Ubuntu 12.04 LTS (Precise Pangolin) (PVHVM)'
-        min-ram: 8192
-        name-filter: 'Performance'
-        setup: prepare_node_devstack.sh
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
-      - name: bare-precise
-        base-image: 'Ubuntu 12.04 LTS (Precise Pangolin) (PVHVM)'
-        min-ram: 8192
-        name-filter: 'Performance'
-        setup: prepare_node_bare.sh
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
-      - name: devstack-trusty
-        base-image: 'Ubuntu 14.04 LTS (Trusty Tahr) (PVHVM)'
-        min-ram: 8192
-        name-filter: 'Performance'
-        setup: prepare_node_devstack.sh
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
-      - name: bare-trusty
-        base-image: 'Ubuntu 14.04 LTS (Trusty Tahr) (PVHVM)'
-        min-ram: 8192
-        name-filter: 'Performance'
-        setup: prepare_node_bare.sh
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
-      - name: bare-centos6
-        base-image: 'CentOS 6 (PVHVM)'
-        min-ram: 8192
-        name-filter: 'Performance'
-        setup: prepare_node_bare.sh
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
-      - name: centos-6
-        base-image: 'CentOS 6 (PVHVM)'
-        min-ram: 8192
-        name-filter: 'Performance'
-        setup: prepare_node_devstack.sh
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
-      - name: ubuntu-trusty
-        min-ram: 8192
-        diskimage: ubuntu-trusty
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
-        name-filter: 'Performance'
-        config-drive: true
-        meta:
-          vm_mode: hvm
-          xenapi_use_agent: 'false'
-      - name: devstack-f21
-        base-image: 'Fedora 21 (PVHVM)'
-        min-ram: 8192
-        name-filter: 'Performance'
-        setup: prepare_node_devstack.sh
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
-      - name: fedora-22
-        min-ram: 8192
-        diskimage: fedora-22
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
-        config-drive: true
-      - name: devstack-centos7
-        base-image: 'CentOS 7 (PVHVM)'
-        min-ram: 8192
-        name-filter: 'Performance'
-        setup: prepare_node_devstack.sh
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
-  - name: rax-iad
-    region-name: 'IAD'
-    cloud: rax
-    api-timeout: 60
-    boot-timeout: 120
-    max-servers: 85
-    rate: 0.001
-    image-type: vhd
-    images:
-      - name: devstack-precise
-        base-image: 'Ubuntu 12.04 LTS (Precise Pangolin) (PVHVM)'
-        min-ram: 8192
-        name-filter: 'Performance'
-        setup: prepare_node_devstack.sh
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
-      - name: bare-precise
-        base-image: 'Ubuntu 12.04 LTS (Precise Pangolin) (PVHVM)'
-        min-ram: 8192
-        name-filter: 'Performance'
-        setup: prepare_node_bare.sh
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
-      - name: devstack-trusty
-        base-image: 'Ubuntu 14.04 LTS (Trusty Tahr) (PVHVM)'
-        min-ram: 8192
-        name-filter: 'Performance'
-        setup: prepare_node_devstack.sh
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
-      - name: bare-trusty
-        base-image: 'Ubuntu 14.04 LTS (Trusty Tahr) (PVHVM)'
-        min-ram: 8192
-        name-filter: 'Performance'
-        setup: prepare_node_bare.sh
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
-      - name: bare-centos6
-        base-image: 'CentOS 6 (PVHVM)'
-        min-ram: 8192
-        name-filter: 'Performance'
-        setup: prepare_node_bare.sh
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
-      - name: centos-6
-        base-image: 'CentOS 6 (PVHVM)'
-        min-ram: 8192
-        name-filter: 'Performance'
-        setup: prepare_node_devstack.sh
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
-      - name: ubuntu-trusty
-        min-ram: 8192
-        diskimage: ubuntu-trusty
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
-        name-filter: 'Performance'
-        config-drive: true
-        meta:
-          vm_mode: hvm
-          xenapi_use_agent: 'false'
-      - name: devstack-precise-check
-        base-image: 'Ubuntu 12.04 LTS (Precise Pangolin) (PVHVM)'
-        min-ram: 8192
-        name-filter: 'Performance'
-        setup: prepare_node_devstack.sh
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
-      - name: devstack-f21
-        base-image: 'Fedora 21 (PVHVM)'
-        min-ram: 8192
-        name-filter: 'Performance'
-        setup: prepare_node_devstack.sh
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
-      - name: fedora-22
-        min-ram: 8192
-        diskimage: fedora-22
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
-        config-drive: true
-      - name: devstack-centos7
-        base-image: 'CentOS 7 (PVHVM)'
-        min-ram: 8192
-        name-filter: 'Performance'
-        setup: prepare_node_devstack.sh
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
-  - name: hpcloud-region-a
-    region-name: 'region-a.geo-1'
-    cloud: hpcloud
-    boot-timeout: 120
-    max-servers: 0
-    rate: 0.1
-    images:
-      - name: devstack-precise-check
-        base-image: 'Ubuntu Server 12.04.5 LTS (amd64 20150707) - Partner Image'
-        min-ram: 8192
-        setup: prepare_node_devstack.sh
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
-  - name: hpcloud-b1
-    region-name: 'region-b.geo-1'
-    cloud: hpcloud
-    api-timeout: 60
-    boot-timeout: 120
-    max-servers: 100
-    networks:
-      - net-id: b6596f90-914a-41e9-b01a-223d90b86e8d
-    availability-zones:
-      - az3
-    rate: 0.1
-    images:
-      - name: devstack-precise-check
-        base-image: 'Ubuntu Server 12.04.5 LTS (amd64 20150707) - Partner Image'
-        min-ram: 30720
-        setup: prepare_node_devstack.sh
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
-      - name: devstack-precise
-        min-ram: 30720
-        diskimage: devstack-precise
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
-        config-drive: true
-      - name: bare-precise
-        base-image: 'Ubuntu Server 12.04.5 LTS (amd64 20150707) - Partner Image'
-        min-ram: 30720
-        setup: prepare_node_bare.sh
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
-      - name: devstack-trusty
-        min-ram: 30720
-        diskimage: devstack-trusty
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
-        config-drive: true
-      - name: bare-trusty
-        base-image: 'Ubuntu Server 14.04.1 LTS (amd64 20150706) - Partner Image'
-        min-ram: 30720
-        setup: prepare_node_bare.sh
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
-      - name: bare-centos6
-        base-image: 'CentOS 6.3 Server 64-bit 20130116'
-        min-ram: 30720
-        setup: prepare_node_bare.sh
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
-      - name: centos-6
-        min-ram: 30720
-        diskimage: centos-6
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
-        config-drive: true
-      - name: ubuntu-trusty
-        min-ram: 30720
-        diskimage: ubuntu-trusty
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
-        config-drive: true
-      - name: devstack-f21
-        base-image: 'Fedora 21 Cloud Base 64-bit 20141203 - Partner Image'
-        min-ram: 30720
-        setup: prepare_node_devstack.sh
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
-      - name: devstack-centos7
-        base-image: 'CentOS 7 x86_64 (2014-09-29) - Partner Image'
-        min-ram: 30720
-        setup: prepare_node_devstack.sh
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
-      - name: devstack-centos7-dib
-        min-ram: 30720
-        diskimage: devstack-centos7-dib
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
-        config-drive: true
-      - name: devstack-fedora21-dib
-        min-ram: 30720
-        diskimage: devstack-fedora21-dib
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
-        config-drive: true
-      - name: fedora-22
-        min-ram: 30720
-        diskimage: fedora-22
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
-        config-drive: true
-  - name: hpcloud-b2
-    region-name: 'region-b.geo-1'
-    cloud: hpcloud
-    api-timeout: 60
-    boot-timeout: 120
-    max-servers: 100
-    networks:
-      - net-id: 90169672-ad5a-4fd5-a1b6-af121203f95c
-    availability-zones:
-      - az3
-    rate: 0.1
-    images:
-      - name: devstack-precise-check
-        base-image: 'Ubuntu Server 12.04.5 LTS (amd64 20150707) - Partner Image'
-        min-ram: 30720
-        setup: prepare_node_devstack.sh
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
-      - name: devstack-precise
-        min-ram: 30720
-        diskimage: devstack-precise
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
-        config-drive: true
-      - name: bare-precise
-        base-image: 'Ubuntu Server 12.04.5 LTS (amd64 20150707) - Partner Image'
-        min-ram: 30720
-        setup: prepare_node_bare.sh
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
-      - name: devstack-trusty
-        min-ram: 30720
-        diskimage: devstack-trusty
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
-        config-drive: true
-      - name: bare-trusty
-        base-image: 'Ubuntu Server 14.04.1 LTS (amd64 20150706) - Partner Image'
-        min-ram: 30720
-        setup: prepare_node_bare.sh
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
-      - name: bare-centos6
-        base-image: 'CentOS 6.3 Server 64-bit 20130116'
-        min-ram: 30720
-        setup: prepare_node_bare.sh
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
-      - name: centos-6
-        min-ram: 30720
-        diskimage: centos-6
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
-        config-drive: true
-      - name: ubuntu-trusty
-        min-ram: 30720
-        diskimage: ubuntu-trusty
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
-        config-drive: true
-      - name: devstack-f21
-        base-image: 'Fedora 21 Cloud Base 64-bit 20141203 - Partner Image'
-        min-ram: 30720
-        setup: prepare_node_devstack.sh
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
-      - name: devstack-centos7
-        base-image: 'CentOS 7 x86_64 (2014-09-29) - Partner Image'
-        min-ram: 30720
-        setup: prepare_node_devstack.sh
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
-      - name: devstack-centos7-dib
-        min-ram: 30720
-        diskimage: devstack-centos7-dib
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
-        config-drive: true
-      - name: devstack-fedora21-dib
-        min-ram: 30720
-        diskimage: devstack-fedora21-dib
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
-        config-drive: true
-      - name: fedora-22
-        min-ram: 30720
-        diskimage: fedora-22
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
-        config-drive: true
-  - name: hpcloud-b3
-    region-name: 'region-b.geo-1'
-    cloud: hpcloud
-    api-timeout: 60
-    boot-timeout: 120
-    max-servers: 100
-    networks:
-      - net-id: 63657422-b84f-4d2d-b7d2-765ac560546b
-    availability-zones:
-      - az3
-    rate: 0.1
-    images:
-      - name: devstack-precise-check
-        base-image: 'Ubuntu Server 12.04.5 LTS (amd64 20150707) - Partner Image'
-        min-ram: 30720
-        setup: prepare_node_devstack.sh
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
-      - name: devstack-precise
-        min-ram: 30720
-        diskimage: devstack-precise
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
-        config-drive: true
-      - name: bare-precise
-        base-image: 'Ubuntu Server 12.04.5 LTS (amd64 20150707) - Partner Image'
-        min-ram: 30720
-        setup: prepare_node_bare.sh
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
-      - name: devstack-trusty
-        min-ram: 30720
-        diskimage: devstack-trusty
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
-        config-drive: true
-      - name: bare-trusty
-        base-image: 'Ubuntu Server 14.04.1 LTS (amd64 20150706) - Partner Image'
-        min-ram: 30720
-        setup: prepare_node_bare.sh
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
-      - name: bare-centos6
-        base-image: 'CentOS 6.3 Server 64-bit 20130116'
-        min-ram: 30720
-        setup: prepare_node_bare.sh
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
-      - name: centos-6
-        min-ram: 30720
-        diskimage: centos-6
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
-        config-drive: true
-      - name: ubuntu-trusty
-        min-ram: 30720
-        diskimage: ubuntu-trusty
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
-        config-drive: true
-      - name: devstack-f21
-        base-image: 'Fedora 21 Cloud Base 64-bit 20141203 - Partner Image'
-        min-ram: 30720
-        setup: prepare_node_devstack.sh
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
-      - name: devstack-centos7
-        base-image: 'CentOS 7 x86_64 (2014-09-29) - Partner Image'
-        min-ram: 30720
-        setup: prepare_node_devstack.sh
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
-      - name: devstack-centos7-dib
-        min-ram: 30720
-        diskimage: devstack-centos7-dib
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
-        config-drive: true
-      - name: devstack-fedora21-dib
-        min-ram: 30720
-        diskimage: devstack-fedora21-dib
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
-        config-drive: true
-      - name: fedora-22
-        min-ram: 30720
-        diskimage: fedora-22
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
-        config-drive: true
-  - name: hpcloud-b4
-    region-name: 'region-b.geo-1'
-    cloud: hpcloud
-    api-timeout: 60
-    boot-timeout: 120
-    max-servers: 100
-    networks:
-      - net-id: f6d0d957-f31d-4e3b-9c07-3d2a4feebc03
-    availability-zones:
-      - az2
-      - az3
-    rate: 0.1
-    images:
-      - name: devstack-precise-check
-        base-image: 'Ubuntu Server 12.04.5 LTS (amd64 20150707) - Partner Image'
-        min-ram: 30720
-        setup: prepare_node_devstack.sh
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
-      - name: devstack-precise
-        min-ram: 30720
-        diskimage: devstack-precise
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
-        config-drive: true
-      - name: bare-precise
-        base-image: 'Ubuntu Server 12.04.5 LTS (amd64 20150707) - Partner Image'
-        min-ram: 30720
-        setup: prepare_node_bare.sh
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
-      - name: devstack-trusty
-        min-ram: 30720
-        diskimage: devstack-trusty
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
-        config-drive: true
-      - name: bare-trusty
-        base-image: 'Ubuntu Server 14.04.1 LTS (amd64 20150706) - Partner Image'
-        min-ram: 30720
-        setup: prepare_node_bare.sh
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
-      - name: bare-centos6
-        base-image: 'CentOS 6.3 Server 64-bit 20130116'
-        min-ram: 30720
-        setup: prepare_node_bare.sh
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
-      - name: centos-6
-        min-ram: 30720
-        diskimage: centos-6
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
-        config-drive: true
-      - name: ubuntu-trusty
-        min-ram: 30720
-        diskimage: ubuntu-trusty
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
-        config-drive: true
-      - name: devstack-f21
-        base-image: 'Fedora 21 Cloud Base 64-bit 20141203 - Partner Image'
-        min-ram: 30720
-        setup: prepare_node_devstack.sh
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
-      - name: devstack-centos7
-        base-image: 'CentOS 7 x86_64 (2014-09-29) - Partner Image'
-        min-ram: 30720
-        setup: prepare_node_devstack.sh
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
-      - name: devstack-centos7-dib
-        min-ram: 30720
-        diskimage: devstack-centos7-dib
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
-        config-drive: true
-      - name: devstack-fedora21-dib
-        min-ram: 30720
-        diskimage: devstack-fedora21-dib
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
-        config-drive: true
-      - name: fedora-22
-        min-ram: 30720
-        diskimage: fedora-22
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
-        config-drive: true
-  - name: hpcloud-b5
-    region-name: 'region-b.geo-1'
-    cloud: hpcloud
-    api-timeout: 60
-    boot-timeout: 120
-    max-servers: 100
-    networks:
-      - net-id: b96c212f-16e1-4b9c-a3d2-09b3871220c2
-    availability-zones:
-      - az1
-      - az2
-      - az3
-    rate: 0.1
-    images:
-      - name: devstack-precise-check
-        base-image: 'Ubuntu Server 12.04.5 LTS (amd64 20150707) - Partner Image'
-        min-ram: 30720
-        setup: prepare_node_devstack.sh
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
-      - name: devstack-precise
-        min-ram: 30720
-        diskimage: devstack-precise
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
-        config-drive: true
-      - name: bare-precise
-        base-image: 'Ubuntu Server 12.04.5 LTS (amd64 20150707) - Partner Image'
-        min-ram: 30720
-        setup: prepare_node_bare.sh
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
-      - name: devstack-trusty
-        min-ram: 30720
-        diskimage: devstack-trusty
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
-        config-drive: true
-      - name: bare-trusty
-        base-image: 'Ubuntu Server 14.04.1 LTS (amd64 20150706) - Partner Image'
-        min-ram: 30720
-        setup: prepare_node_bare.sh
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
-      - name: bare-centos6
-        base-image: 'CentOS 6.3 Server 64-bit 20130116'
-        min-ram: 30720
-        setup: prepare_node_bare.sh
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
-      - name: centos-6
-        min-ram: 30720
-        diskimage: centos-6
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
-        config-drive: true
-      - name: ubuntu-trusty
-        min-ram: 30720
-        diskimage: ubuntu-trusty
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
-        config-drive: true
-      - name: devstack-f21
-        base-image: 'Fedora 21 Cloud Base 64-bit 20141203 - Partner Image'
-        min-ram: 30720
-        setup: prepare_node_devstack.sh
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
-      - name: devstack-centos7
-        base-image: 'CentOS 7 x86_64 (2014-09-29) - Partner Image'
-        min-ram: 30720
-        setup: prepare_node_devstack.sh
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
-      - name: devstack-centos7-dib
-        min-ram: 30720
-        diskimage: devstack-centos7-dib
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
-        config-drive: true
-      - name: devstack-fedora21-dib
-        min-ram: 30720
-        diskimage: devstack-fedora21-dib
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
-        config-drive: true
-      - name: fedora-22
-        min-ram: 30720
-        diskimage: fedora-22
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
-        config-drive: true
-  - name: ovh-gra1
-    region-name: 'GRA1'
-    cloud: ovh
-    api-timeout: 60
-    boot-timeout: 120
-    max-servers: 0
-    rate: 10.0
-    image-type: raw
-    images:
-      - name: centos-6
-        min-ram: 8000
-        name-filter: 'ssd-osFoundation'
-        diskimage: centos-6
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
-      - name: devstack-precise
-        min-ram: 8000
-        name-filter: 'ssd-osFoundation'
-        diskimage: devstack-precise
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
-      - name: devstack-trusty
-        min-ram: 8000
-        name-filter: 'ssd-osFoundation'
-        diskimage: devstack-trusty
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
-      - name: ubuntu-trusty-check
-        min-ram: 8000
-        name-filter: 'ssd-osFoundation'
-        diskimage: ubuntu-trusty
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
-      - name: ubuntu-trusty
-        min-ram: 8000
-        name-filter: 'ssd-osFoundation'
-        diskimage: ubuntu-trusty
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
-  - name: tripleo-test-cloud-rh1
-    cloud: tripleo-test-cloud-rh1
-    boot-timeout: 120
-    max-servers: 75
-    rate: 0.001
-    networks:
-      - net-label: default-net
-      - net-label: tripleo-bm-test
-    images:
-      - name: tripleo-f21
-        base-image: 'Fedora 21 64-bit'
-        min-ram: 8192
-        name-filter: h1
-        setup: prepare_node_tripleo.sh
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
-      - name: tripleo-f22
-        base-image: 'Fedora 22 64-bit'
-        min-ram: 8192
-        name-filter: h1
-        setup: prepare_node_tripleo.sh
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
-targets:
-  - name: jenkins01
-  - name: jenkins02
-  - name: jenkins03
-  - name: jenkins04
-  - name: jenkins05
-  - name: jenkins06
-  - name: jenkins07
-
-diskimages:
-  - name: centos-6
-    elements:
-      - centos
-      - vm
-      - openstack-repos
-      - nodepool-base
-      - node-devstack
-      - cache-bindep
-    env-vars:
-      TMPDIR: /opt/dib_tmp
-      DIB_IMAGE_CACHE: /opt/dib_cache
-  - name: ubuntu-trusty
-    elements:
-      - ubuntu-minimal
-      - vm
-      - simple-init
-      - openstack-repos
-      - nodepool-base
-      - node-devstack
-      - cache-bindep
-      - growroot
-    release: trusty
-    env-vars:
-      TMPDIR: /opt/dib_tmp
-      DIB_IMAGE_CACHE: /opt/dib_cache
-      DIB_APT_LOCAL_CACHE: '0'
-      DIB_DISABLE_APT_CLEANUP: '1'
-  - name: devstack-trusty
-    elements:
-      - ubuntu
-      - vm
-      - openstack-repos
-      - nodepool-base
-      - node-devstack
-      - cache-bindep
-    release: trusty
-    env-vars:
-      TMPDIR: /opt/dib_tmp
-      DIB_IMAGE_CACHE: /opt/dib_cache
-      DIB_APT_LOCAL_CACHE: '0'
-      DIB_DISABLE_APT_CLEANUP: '1'
-      QEMU_IMG_OPTIONS: compat=0.10
-  - name: devstack-precise
-    elements:
-      - ubuntu
-      - vm
-      - openstack-repos
-      - nodepool-base
-      - node-devstack
-      - cache-bindep
-    release: precise
-    env-vars:
-      TMPDIR: /opt/dib_tmp
-      DIB_IMAGE_CACHE: /opt/dib_cache
-      DIB_APT_LOCAL_CACHE: '0'
-      DIB_DISABLE_APT_CLEANUP: '1'
-      QEMU_IMG_OPTIONS: compat=0.10
-  - name: devstack-centos7-dib
-    elements:
-      - centos7
-      - vm
-      - openstack-repos
-      - nodepool-base
-      - node-devstack
-      - cache-bindep
-    env-vars:
-      TMPDIR: /opt/dib_tmp
-      DIB_IMAGE_CACHE: /opt/dib_cache
-      QEMU_IMG_OPTIONS: compat=0.10
-  - name: devstack-fedora21-dib
-    elements:
-      - fedora
-      - vm
-      - openstack-repos
-      - nodepool-base
-      - node-devstack
-      - cache-bindep
-    release: 21
-    env-vars:
-      TMPDIR: /opt/dib_tmp
-      DIB_IMAGE_CACHE: /opt/dib_cache
-      QEMU_IMG_OPTIONS: compat=0.10
-  - name: fedora-22
-    elements:
-      - fedora-minimal
-      - vm
-      - simple-init
-      - openstack-repos
-      - nodepool-base
-      - node-devstack
-      - puppet
-    release: 22
-    env-vars:
-      TMPDIR: /opt/dib_tmp
-      DIB_IMAGE_CACHE: /opt/dib_cache
-      QEMU_IMG_OPTIONS: compat=0.10
diff --git a/test-requirements.txt b/test-requirements.txt
index 1c3ec263f6..4d785cf785 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -2,4 +2,3 @@ hacking>=0.5.6,<0.8
 Sphinx>=1.1.2,<1.2
 oslosphinx
 bashate>=0.2
--e git://git.openstack.org/openstack-infra/nodepool#egg=nodepool
diff --git a/tools/nodepool_log_config.py b/tools/nodepool_log_config.py
index 1fddbb7c69..b4ec07a482 100755
--- a/tools/nodepool_log_config.py
+++ b/tools/nodepool_log_config.py
@@ -28,7 +28,8 @@ import yaml
 
 # default paths and outputs
 MODULES_PATH = '../modules/openstack_project/templates/nodepool'
-CONFIG_FILE = MODULES_PATH + '/nodepool.yaml.erb'
+# default the project-config repo path to the same folder as this repo
+CONFIG_FILE = '../../project-config/nodepool/nodepool.yaml'
 LOGGING_CONFIG_FILE = MODULES_PATH + '/nodepool.logging.conf.erb'
 LOG_DIR = '/var/log/nodepool'
 IMAGE_LOG_DIR = '<%= @image_log_document_root %>'
diff --git a/tox.ini b/tox.ini
index 9bf7590574..f5d7c97523 100644
--- a/tox.ini
+++ b/tox.ini
@@ -26,8 +26,5 @@ select = H231
 [testenv:bashate]
 commands = {toxinidir}/tools/run-bashate.sh
 
-[testenv:nodepool]
-commands = nodepool -c {toxinidir}/modules/openstack_project/templates/nodepool/nodepool.yaml.erb config-validate
-
 [testenv:modulesenv]
 commands = python {toxinidir}/tools/sorted_modules_env.py {toxinidir}/modules.env