From 4ab3ace934b7ef93ef7298be80e8a46c416d0194 Mon Sep 17 00:00:00 2001
From: Clark Boylan <clark.boylan@gmail.com>
Date: Tue, 23 Feb 2016 10:14:18 -0800
Subject: [PATCH] Clean up infracloud clouds.yaml to actually work

This uses the correct infra domain name, changes domain keys from id to
name, a fixes indentation for various keys.

Change-Id: Ic8a8f67bc2586ca640b8c3e500f6cdad1abf0ebd
---
 .../templates/nodepool/clouds.yaml.erb        |  4 ++--
 .../puppetmaster/all-clouds.yaml.erb          | 24 +++++++++----------
 .../puppetmaster/ansible-clouds.yaml.erb      |  8 +++++--
 3 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/modules/openstack_project/templates/nodepool/clouds.yaml.erb b/modules/openstack_project/templates/nodepool/clouds.yaml.erb
index c616711a2b..b8b6fc52e0 100644
--- a/modules/openstack_project/templates/nodepool/clouds.yaml.erb
+++ b/modules/openstack_project/templates/nodepool/clouds.yaml.erb
@@ -52,8 +52,8 @@ clouds:
       username: '<%= infracloud_username %>'
       password: '<%= infracloud_password %>'
       project_name: '<%= infracloud_project %>'
-      user_domain_id: 'default'
-      project_domain_id: 'default'
+      user_domain_name: 'infra'
+      project_domain_name: 'infra'
       auth_url: 'https://controller00.hpuswest.ic.openstack.org:35357/v3'
     auth_type: 'v3password'
     cacert: '/etc/openstack/infracloud_west_cacert.pem'
diff --git a/modules/openstack_project/templates/puppetmaster/all-clouds.yaml.erb b/modules/openstack_project/templates/puppetmaster/all-clouds.yaml.erb
index 94d6609b4a..00b39f982c 100644
--- a/modules/openstack_project/templates/puppetmaster/all-clouds.yaml.erb
+++ b/modules/openstack_project/templates/puppetmaster/all-clouds.yaml.erb
@@ -84,12 +84,12 @@ clouds:
       username: <%= @puppetmaster_clouds['openstackjenkins_infracloud_username'] %>
       password: <%= @puppetmaster_clouds['openstackjenkins_infracloud_password'] %>
       project_name: <%= @puppetmaster_clouds['openstackjenkins_infracloud_project_name'] %>
-      cacert: '/etc/openstack/infracloud_west_cacert.pem'
-      auth_type: 'v3password'
-      identity_api_version: '3'
-      floating_ip_source: 'None'
-      project_domain_id: default
-      user_domain_id: default
+      project_domain_name: 'infra'
+      user_domain_name: 'infra'
+    cacert: '/etc/openstack/infracloud_west_cacert.pem'
+    auth_type: 'v3password'
+    identity_api_version: '3'
+    floating_ip_source: 'None'
   openstackci-infracloud-west:
     region_name: RegionOne
     auth:
@@ -97,12 +97,12 @@ clouds:
       username: <%= @puppetmaster_clouds['openstackci_infracloud_username'] %>
       password: <%= @puppetmaster_clouds['openstackci_infracloud_password'] %>
       project_name: <%= @puppetmaster_clouds['openstackci_infracloud_project_name'] %>
-      cacert: '/etc/openstack/infracloud_west_cacert.pem'
-      auth_type: 'v3password'
-      identity_api_version: '3'
-      floating_ip_source: 'None'
-      project_domain_id: default
-      user_domain_id: default
+      project_domain_name: 'infra'
+      user_domain_name: 'infra'
+    cacert: '/etc/openstack/infracloud_west_cacert.pem'
+    auth_type: 'v3password'
+    identity_api_version: '3'
+    floating_ip_source: 'None'
   openstackjenkins-rax:
     regions:
     - DFW
diff --git a/modules/openstack_project/templates/puppetmaster/ansible-clouds.yaml.erb b/modules/openstack_project/templates/puppetmaster/ansible-clouds.yaml.erb
index 2c9c40cbc9..b85cc4dfe0 100644
--- a/modules/openstack_project/templates/puppetmaster/ansible-clouds.yaml.erb
+++ b/modules/openstack_project/templates/puppetmaster/ansible-clouds.yaml.erb
@@ -45,5 +45,9 @@ clouds:
       username: <%= @puppetmaster_clouds['openstackci_infracloud_username'] %>
       password: <%= @puppetmaster_clouds['openstackci_infracloud_password'] %>
       project_name: <%= @puppetmaster_clouds['openstackci_infracloud_project_name'] %>
-      project_domain_id: default
-      user_domain_id: default
+      project_domain_name: 'infra'
+      user_domain_name: 'infra'
+    cacert: '/etc/openstack/infracloud_west_cacert.pem'
+    auth_type: 'v3password'
+    identity_api_version: '3'
+    floating_ip_source: 'None'