From 3f9d060795455a24484da56e5dc3c70e39f234a8 Mon Sep 17 00:00:00 2001
From: Paul Belanger <pabelanger@redhat.com>
Date: Sun, 3 Sep 2017 16:13:24 -0400
Subject: [PATCH] Remove datacentred credentials

We currently are not using these in production, remove them to help
clean up our clouds.yaml files.

Change-Id: I81b4de2fda50b61a17e99c30cfe4ec44c55df343
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
---
 manifests/site.pp                                      |  9 ---------
 .../templates/nodepool/clouds.yaml.erb                 | 10 ----------
 .../templates/puppetmaster/all-clouds.yaml.erb         | 10 ----------
 3 files changed, 29 deletions(-)

diff --git a/manifests/site.pp b/manifests/site.pp
index 0509a53eb5..a53aed39b6 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -823,9 +823,6 @@ node 'nodepool.openstack.org' {
   $vexxhost_username   = hiera('nodepool_vexxhost_username', 'username')
   $vexxhost_password   = hiera('nodepool_vexxhost_password')
   $vexxhost_project    = hiera('nodepool_vexxhost_project', 'project')
-  $datacentred_username   = hiera('nodepool_datacentred_username', 'username')
-  $datacentred_password   = hiera('nodepool_datacentred_password')
-  $datacentred_project    = hiera('nodepool_datacentred_project', 'project')
   $citycloud_username = hiera('nodepool_citycloud_username', 'username')
   $citycloud_password = hiera('nodepool_citycloud_password')
   $clouds_yaml = template("openstack_project/nodepool/clouds.yaml.erb")
@@ -928,9 +925,6 @@ node /^nl\d+\.openstack\.org$/ {
   $vexxhost_username              = hiera('nodepool_vexxhost_username', 'username')
   $vexxhost_password              = hiera('nodepool_vexxhost_password')
   $vexxhost_project               = hiera('nodepool_vexxhost_project', 'project')
-  $datacentred_username           = hiera('nodepool_datacentred_username', 'username')
-  $datacentred_password           = hiera('nodepool_datacentred_password')
-  $datacentred_project            = hiera('nodepool_datacentred_project', 'project')
   $citycloud_username             = hiera('nodepool_citycloud_username', 'username')
   $citycloud_password             = hiera('nodepool_citycloud_password')
   $clouds_yaml                    = template("openstack_project/nodepool/clouds.yaml.erb")
@@ -999,9 +993,6 @@ node /^nb\d+\.openstack\.org$/ {
   $vexxhost_username   = hiera('nodepool_vexxhost_username', 'username')
   $vexxhost_password   = hiera('nodepool_vexxhost_password')
   $vexxhost_project    = hiera('nodepool_vexxhost_project', 'project')
-  $datacentred_username   = hiera('nodepool_datacentred_username', 'username')
-  $datacentred_password   = hiera('nodepool_datacentred_password')
-  $datacentred_project    = hiera('nodepool_datacentred_project', 'project')
   $citycloud_username = hiera('nodepool_citycloud_username', 'username')
   $citycloud_password = hiera('nodepool_citycloud_password')
   $clouds_yaml = template("openstack_project/nodepool/clouds.yaml.erb")
diff --git a/modules/openstack_project/templates/nodepool/clouds.yaml.erb b/modules/openstack_project/templates/nodepool/clouds.yaml.erb
index 30bbf3c55c..2478cd4715 100644
--- a/modules/openstack_project/templates/nodepool/clouds.yaml.erb
+++ b/modules/openstack_project/templates/nodepool/clouds.yaml.erb
@@ -83,16 +83,6 @@ clouds:
     identity_api_version: '3'
     floating_ip_source: None
     cacert: /home/nodepool/.config/openstack/infracloud_chocolate_cacert.pem
-  datacentred:
-    region_name: sal01
-    profile: datacentred
-    auth:
-      username: '<%= @datacentred_username %>'
-      password: '<%= @datacentred_password %>'
-      project_name: '<%= @datacentred_project %>'
-      project_domain_name: default
-      user_domain_name: default
-    identity_api_version: '2'
   citycloud:
     regions:
       - Lon1
diff --git a/modules/openstack_project/templates/puppetmaster/all-clouds.yaml.erb b/modules/openstack_project/templates/puppetmaster/all-clouds.yaml.erb
index fdc95741a6..a98f3639ba 100644
--- a/modules/openstack_project/templates/puppetmaster/all-clouds.yaml.erb
+++ b/modules/openstack_project/templates/puppetmaster/all-clouds.yaml.erb
@@ -191,16 +191,6 @@ clouds:
       username: '<%= @puppetmaster_clouds['openstackci_vexxhost_username'] %>'
       password: '<%= @puppetmaster_clouds['openstackci_vexxhost_password'] %>'
       project_name: '<%= @puppetmaster_clouds['openstackci_vexxhost_project_name'] %>'
-  openstackzuul-datacentred:
-    region_name: sal01
-    profile: datacentred
-    auth:
-      username: <%= @puppetmaster_clouds['openstackzuul_datacentred_username'] %>
-      password: <%= @puppetmaster_clouds['openstackzuul_datacentred_password'] %>
-      project_name: <%= @puppetmaster_clouds['openstackzuul_datacentred_project'] %>
-      project_domain_name: default
-      user_domain_name: default
-    identity_api_version: '2'
   openstackci-citycloud:
     regions:
       - Lon1