From 542999b05e3902e7bb2a4236c5fd7131594bbcbd Mon Sep 17 00:00:00 2001
From: "James E. Blair" <jeblair@linux.vnet.ibm.com>
Date: Fri, 15 Apr 2016 10:30:22 -0700
Subject: [PATCH] Normalize list indentation in clouds.yaml

Yes, they both work, but generally we use this form.

Change-Id: I7d04194cacc9fcaeab9176c761de4b2730ac4667
---
 .../templates/nodepool/clouds.yaml.erb        | 10 +++---
 .../puppetmaster/all-clouds.yaml.erb          | 36 +++++++++----------
 .../puppetmaster/ansible-clouds.yaml.erb      | 20 +++++------
 3 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/modules/openstack_project/templates/nodepool/clouds.yaml.erb b/modules/openstack_project/templates/nodepool/clouds.yaml.erb
index dff2457c20..ad1c0cc4d1 100644
--- a/modules/openstack_project/templates/nodepool/clouds.yaml.erb
+++ b/modules/openstack_project/templates/nodepool/clouds.yaml.erb
@@ -42,11 +42,11 @@ clouds:
       username: '<%= internap_username %>'
       password: '<%= internap_password %>'
       project_name: '<%= internap_project %>'
-    networks: 
-    - name: inap-17304-WAN2342
-      routes_externally: True
-    - name: inap-17304-LAN3326
-      routes_externally: False
+    networks:
+      - name: inap-17304-WAN2342
+        routes_externally: True
+      - name: inap-17304-LAN3326
+        routes_externally: False
   osic-cloud1:
     region_name: RegionOne
     auth:
diff --git a/modules/openstack_project/templates/puppetmaster/all-clouds.yaml.erb b/modules/openstack_project/templates/puppetmaster/all-clouds.yaml.erb
index c7b5cf8d50..369626b073 100644
--- a/modules/openstack_project/templates/puppetmaster/all-clouds.yaml.erb
+++ b/modules/openstack_project/templates/puppetmaster/all-clouds.yaml.erb
@@ -35,10 +35,10 @@ clouds:
       password: <%= @puppetmaster_clouds['openstackci_internap_password'] %>
       project_name: <%= @puppetmaster_clouds['openstackci_internap_project_name'] %>
     networks: 
-    - name: inap-17301-WAN2344
-      routes_externally: True
-    - name: inap-17301-LAN3328
-      routes_externally: False
+      - name: inap-17301-WAN2344
+        routes_externally: True
+      - name: inap-17301-LAN3328
+        routes_externally: False
   openstackjenkins-internap:
     region_name: nyj01
     profile: internap
@@ -48,9 +48,9 @@ clouds:
       project_name: <%= @puppetmaster_clouds['openstackjenkins_internap_project_name'] %>
   openstackci-ovh:
     regions:
-    - GRA1
-    - SBG1
-    - BHS1
+      - GRA1
+      - SBG1
+      - BHS1
     profile: ovh
     auth:
       username: <%= @puppetmaster_clouds['openstackci_ovh_username'] %>
@@ -58,9 +58,9 @@ clouds:
       project_name: <%= @puppetmaster_clouds['openstackci_ovh_project_name'] %>
   openstackci-rax:
     regions:
-    - DFW
-    - ORD
-    - IAD
+      - DFW
+      - ORD
+      - IAD
     profile: rackspace
     auth:
       username: <%= @puppetmaster_clouds['openstackci_rax_username'] %>
@@ -75,9 +75,9 @@ clouds:
       project_name: <%= @puppetmaster_clouds['openstackjenkins_bluebox_project_name'] %>
   openstackjenkins-rax:
     regions:
-    - DFW
-    - ORD
-    - IAD
+      - DFW
+      - ORD
+      - IAD
     profile: rackspace
     auth:
       username: <%= @puppetmaster_clouds['openstackjenkins_rax_username'] %>
@@ -85,8 +85,8 @@ clouds:
       project_id: <%= @puppetmaster_clouds['openstackjenkins_rax_project_id'] %>
   openstackjenkins-ovh:
     regions:
-    - GRA1
-    - SBG1
+      - GRA1
+      - SBG1
     profile: ovh
     auth:
       username: <%= @puppetmaster_clouds['openstackjenkins_ovh_username'] %>
@@ -94,9 +94,9 @@ clouds:
       project_name: <%= @puppetmaster_clouds['openstackjenkins_ovh_project_name'] %>
   openstack-rax:
     regions:
-    - DFW
-    - ORD
-    - IAD
+      - DFW
+      - ORD
+      - IAD
     profile: rackspace
     auth:
       username: <%= @puppetmaster_clouds['openstack_rax_username'] %>
diff --git a/modules/openstack_project/templates/puppetmaster/ansible-clouds.yaml.erb b/modules/openstack_project/templates/puppetmaster/ansible-clouds.yaml.erb
index 29e227e6ec..5d2a7c9aac 100644
--- a/modules/openstack_project/templates/puppetmaster/ansible-clouds.yaml.erb
+++ b/modules/openstack_project/templates/puppetmaster/ansible-clouds.yaml.erb
@@ -19,15 +19,15 @@ clouds:
       password: <%= @puppetmaster_clouds['openstackci_internap_password'] %>
       project_name: <%= @puppetmaster_clouds['openstackci_internap_project_name'] %>
     networks: 
-    - name: inap-17301-WAN2344
-      routes_externally: True
-    - name: inap-17301-LAN3328
-      routes_externally: False
+      - name: inap-17301-WAN2344
+        routes_externally: True
+      - name: inap-17301-LAN3328
+        routes_externally: False
   openstackci-ovh:
     regions:
-    - GRA1
-    - SBG1
-    - BHS1
+      - GRA1
+      - SBG1
+      - BHS1
     profile: ovh
     auth:
       username: <%= @puppetmaster_clouds['openstackci_ovh_username'] %>
@@ -35,9 +35,9 @@ clouds:
       project_name: <%= @puppetmaster_clouds['openstackci_ovh_project_name'] %>
   openstackci-rax:
     regions:
-    - DFW
-    - ORD
-    - IAD
+      - DFW
+      - ORD
+      - IAD
     profile: rackspace
     auth:
       username: <%= @puppetmaster_clouds['openstackci_rax_username'] %>