From 03978183bf6bc4a6ef6369c9a1745498811e0999 Mon Sep 17 00:00:00 2001
From: Brian Hunter <bhunter@tesora.com>
Date: Thu, 31 Mar 2016 13:13:26 -0400
Subject: [PATCH] remove tab characters in puppet code

This simply replaces tab characters with spaces in the puppet code to
allow better readability with a variety of editors.

Change-Id: I92004379a42aa1186fad3948258d3a6bcee05b34
---
 .../puppet/manifests/haproxy.pp               | 60 +++++++++----------
 .../puppet/manifests/keystone.pp              |  2 +-
 deployment_scripts/puppet/manifests/trove.pp  |  6 +-
 deployment_tasks.yaml                         |  2 +-
 4 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/deployment_scripts/puppet/manifests/haproxy.pp b/deployment_scripts/puppet/manifests/haproxy.pp
index 8464beb..13e4d21 100644
--- a/deployment_scripts/puppet/manifests/haproxy.pp
+++ b/deployment_scripts/puppet/manifests/haproxy.pp
@@ -13,36 +13,36 @@ if ($use_trove) {
   $ipaddresses         = hiera_array('trove_ipaddresses', values($troves_address_map))
   $public_virtual_ip   = hiera('public_vip')
   $internal_virtual_ip = hiera('management_vip')
-	
-	# configure trove ha proxy
-    Openstack::Ha::Haproxy_service {
-		internal_virtual_ip => $internal_virtual_ip,
-		ipaddresses         => $ipaddresses,
-		public_virtual_ip   => $public_virtual_ip,
-		server_names        => $server_names,
-		public_ssl          => $public_ssl_hash['services'],
-	}
 
-	openstack::ha::haproxy_service { 'trove-api':
-	    order               => '210',
-	    listen_port         => 8779,
-		internal            => true,
-        public              => true,
-	}
+  # configure trove ha proxy
+  Openstack::Ha::Haproxy_service {
+    internal_virtual_ip => $internal_virtual_ip,
+    ipaddresses         => $ipaddresses,
+    public_virtual_ip   => $public_virtual_ip,
+    server_names        => $server_names,
+    public_ssl          => $public_ssl_hash['services'],
+  }
 
-	openstack::ha::haproxy_service { 'trove-rabbitmq':
-		order                  => '211',
-		listen_port            => 55671,
-		define_backups         => true,
-		internal               => true,
-        public                 => true,
-		haproxy_config_options => {
-		  'option'         => ['tcpka'],
-		  'timeout client' => '48h',
-		  'timeout server' => '48h',
-		  'balance'        => 'roundrobin',
-		  'mode'           => 'tcp'
-		},
-		balancermember_options => 'check inter 5000 rise 2 fall 3',  
-	}
+  openstack::ha::haproxy_service { 'trove-api':
+    order               => '210',
+    listen_port         => 8779,
+    internal            => true,
+    public              => true,
+  }
+
+  openstack::ha::haproxy_service { 'trove-rabbitmq':
+    order               => '211',
+    listen_port         => 55671,
+    define_backups      => true,
+    internal            => true,
+    public              => true,
+    haproxy_config_options => {
+      'option'          => ['tcpka'],
+      'timeout client'  => '48h',
+      'timeout server'  => '48h',
+      'balance'         => 'roundrobin',
+      'mode'            => 'tcp'
+    },
+    balancermember_options => 'check inter 5000 rise 2 fall 3',
+  }
 }
diff --git a/deployment_scripts/puppet/manifests/keystone.pp b/deployment_scripts/puppet/manifests/keystone.pp
index 2d22f34..d8cbc3b 100644
--- a/deployment_scripts/puppet/manifests/keystone.pp
+++ b/deployment_scripts/puppet/manifests/keystone.pp
@@ -41,4 +41,4 @@ class { 'trove::keystone::auth':
   admin_url           => $admin_url,
   region              => $region,
   tenant              => $tenant,
-}
\ No newline at end of file
+}
diff --git a/deployment_scripts/puppet/manifests/trove.pp b/deployment_scripts/puppet/manifests/trove.pp
index 4b4c5ea..352b67d 100644
--- a/deployment_scripts/puppet/manifests/trove.pp
+++ b/deployment_scripts/puppet/manifests/trove.pp
@@ -59,7 +59,7 @@ if $trove_hash['metadata']['enabled'] {
     rabbit_userid         => $trove_hash['metadata']['rabbit_user'],
     rabbit_use_ssl        => false,
     nova_proxy_admin_pass => $nova_hash['user_password'],
-	nova_proxy_admin_user => 'nova',
+    nova_proxy_admin_user => 'nova',
     nova_proxy_admin_tenant_name => pick($nova_hash['tenant_name'], 'services'),
   }
 
@@ -82,11 +82,11 @@ if $trove_hash['metadata']['enabled'] {
     verbose           => true,
     auth_url          => "http://${service_endpoint}:5000/v2.0/",
   }
-  
+
   firewall { $firewall_rule :
     dport  => $api_bind_port,
     proto  => 'tcp',
     action => 'accept',
   }
 
-}
\ No newline at end of file
+}
diff --git a/deployment_tasks.yaml b/deployment_tasks.yaml
index 9b508ba..f382b0e 100644
--- a/deployment_tasks.yaml
+++ b/deployment_tasks.yaml
@@ -81,4 +81,4 @@
   parameters:
     puppet_manifest: puppet/manifests/cluster.pp
     puppet_modules: puppet/modules:/etc/puppet/modules
-    timeout: 1800
\ No newline at end of file
+    timeout: 1800