Browse Source

Merge "remove tab characters in puppet code"

changes/61/327261/1
Jenkins 3 years ago
parent
commit
c0aace5e4a

+ 30
- 30
deployment_scripts/puppet/manifests/haproxy.pp View File

@@ -13,36 +13,36 @@ if ($use_trove) {
13 13
   $ipaddresses         = hiera_array('trove_ipaddresses', values($troves_address_map))
14 14
   $public_virtual_ip   = hiera('public_vip')
15 15
   $internal_virtual_ip = hiera('management_vip')
16
-	
17
-	# configure trove ha proxy
18
-    Openstack::Ha::Haproxy_service {
19
-		internal_virtual_ip => $internal_virtual_ip,
20
-		ipaddresses         => $ipaddresses,
21
-		public_virtual_ip   => $public_virtual_ip,
22
-		server_names        => $server_names,
23
-		public_ssl          => $public_ssl_hash['services'],
24
-	}
25 16
 
26
-	openstack::ha::haproxy_service { 'trove-api':
27
-	    order               => '210',
28
-	    listen_port         => 8779,
29
-		internal            => true,
30
-        public              => true,
31
-	}
17
+  # configure trove ha proxy
18
+  Openstack::Ha::Haproxy_service {
19
+    internal_virtual_ip => $internal_virtual_ip,
20
+    ipaddresses         => $ipaddresses,
21
+    public_virtual_ip   => $public_virtual_ip,
22
+    server_names        => $server_names,
23
+    public_ssl          => $public_ssl_hash['services'],
24
+  }
32 25
 
33
-	openstack::ha::haproxy_service { 'trove-rabbitmq':
34
-		order                  => '211',
35
-		listen_port            => 55671,
36
-		define_backups         => true,
37
-		internal               => true,
38
-        public                 => true,
39
-		haproxy_config_options => {
40
-		  'option'         => ['tcpka'],
41
-		  'timeout client' => '48h',
42
-		  'timeout server' => '48h',
43
-		  'balance'        => 'roundrobin',
44
-		  'mode'           => 'tcp'
45
-		},
46
-		balancermember_options => 'check inter 5000 rise 2 fall 3',  
47
-	}
26
+  openstack::ha::haproxy_service { 'trove-api':
27
+    order               => '210',
28
+    listen_port         => 8779,
29
+    internal            => true,
30
+    public              => true,
31
+  }
32
+
33
+  openstack::ha::haproxy_service { 'trove-rabbitmq':
34
+    order               => '211',
35
+    listen_port         => 55671,
36
+    define_backups      => true,
37
+    internal            => true,
38
+    public              => true,
39
+    haproxy_config_options => {
40
+      'option'          => ['tcpka'],
41
+      'timeout client'  => '48h',
42
+      'timeout server'  => '48h',
43
+      'balance'         => 'roundrobin',
44
+      'mode'            => 'tcp'
45
+    },
46
+    balancermember_options => 'check inter 5000 rise 2 fall 3',
47
+  }
48 48
 }

+ 1
- 1
deployment_scripts/puppet/manifests/keystone.pp View File

@@ -41,4 +41,4 @@ class { 'trove::keystone::auth':
41 41
   admin_url           => $admin_url,
42 42
   region              => $region,
43 43
   tenant              => $tenant,
44
-}
44
+}

+ 3
- 3
deployment_scripts/puppet/manifests/trove.pp View File

@@ -59,7 +59,7 @@ if $trove_hash['metadata']['enabled'] {
59 59
     rabbit_userid         => $trove_hash['metadata']['rabbit_user'],
60 60
     rabbit_use_ssl        => false,
61 61
     nova_proxy_admin_pass => $nova_hash['user_password'],
62
-	nova_proxy_admin_user => 'nova',
62
+    nova_proxy_admin_user => 'nova',
63 63
     nova_proxy_admin_tenant_name => pick($nova_hash['tenant_name'], 'services'),
64 64
   }
65 65
 
@@ -82,11 +82,11 @@ if $trove_hash['metadata']['enabled'] {
82 82
     verbose           => true,
83 83
     auth_url          => "http://${service_endpoint}:5000/v2.0/",
84 84
   }
85
-  
85
+
86 86
   firewall { $firewall_rule :
87 87
     dport  => $api_bind_port,
88 88
     proto  => 'tcp',
89 89
     action => 'accept',
90 90
   }
91 91
 
92
-}
92
+}

+ 1
- 1
deployment_tasks.yaml View File

@@ -81,4 +81,4 @@
81 81
   parameters:
82 82
     puppet_manifest: puppet/manifests/cluster.pp
83 83
     puppet_modules: puppet/modules:/etc/puppet/modules
84
-    timeout: 1800
84
+    timeout: 1800

Loading…
Cancel
Save