summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Hunter <bhunter@tesora.com>2016-03-31 13:13:26 -0400
committerBrian Hunter <bhunter@tesora.com>2016-04-13 09:34:56 -0400
commit03978183bf6bc4a6ef6369c9a1745498811e0999 (patch)
tree75e9edb1be2f3f1eb53958e2c309b9456304c0e9
parent219f2ff75daf06790c7cf876c474f926aa34792b (diff)
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
Notes
Notes (review): Code-Review+1: Shaik Apsar <shaik.apsar@hotmail.com> Code-Review+1: Bhaskar Duvvuri <bhaskara.duvvuri@intl.att.com> Code-Review+2: Ram Sateesh Talari <ramsateesh.talari@intl.att.com> Workflow+1: Ram Sateesh Talari <ramsateesh.talari@intl.att.com> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Thu, 02 Jun 2016 09:08:45 +0000 Reviewed-on: https://review.openstack.org/300102 Project: openstack/fuel-plugin-dbaas-trove Branch: refs/heads/master
-rw-r--r--deployment_scripts/puppet/manifests/haproxy.pp60
-rw-r--r--deployment_scripts/puppet/manifests/keystone.pp2
-rw-r--r--deployment_scripts/puppet/manifests/trove.pp6
-rw-r--r--deployment_tasks.yaml2
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) {
13 $ipaddresses = hiera_array('trove_ipaddresses', values($troves_address_map)) 13 $ipaddresses = hiera_array('trove_ipaddresses', values($troves_address_map))
14 $public_virtual_ip = hiera('public_vip') 14 $public_virtual_ip = hiera('public_vip')
15 $internal_virtual_ip = hiera('management_vip') 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': 17 # configure trove ha proxy
27 order => '210', 18 Openstack::Ha::Haproxy_service {
28 listen_port => 8779, 19 internal_virtual_ip => $internal_virtual_ip,
29 internal => true, 20 ipaddresses => $ipaddresses,
30 public => true, 21 public_virtual_ip => $public_virtual_ip,
31 } 22 server_names => $server_names,
23 public_ssl => $public_ssl_hash['services'],
24 }
32 25
33 openstack::ha::haproxy_service { 'trove-rabbitmq': 26 openstack::ha::haproxy_service { 'trove-api':
34 order => '211', 27 order => '210',
35 listen_port => 55671, 28 listen_port => 8779,
36 define_backups => true, 29 internal => true,
37 internal => true, 30 public => true,
38 public => true, 31 }
39 haproxy_config_options => { 32
40 'option' => ['tcpka'], 33 openstack::ha::haproxy_service { 'trove-rabbitmq':
41 'timeout client' => '48h', 34 order => '211',
42 'timeout server' => '48h', 35 listen_port => 55671,
43 'balance' => 'roundrobin', 36 define_backups => true,
44 'mode' => 'tcp' 37 internal => true,
45 }, 38 public => true,
46 balancermember_options => 'check inter 5000 rise 2 fall 3', 39 haproxy_config_options => {
47 } 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}
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':
41 admin_url => $admin_url, 41 admin_url => $admin_url,
42 region => $region, 42 region => $region,
43 tenant => $tenant, 43 tenant => $tenant,
44} \ No newline at end of file 44}
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'] {
59 rabbit_userid => $trove_hash['metadata']['rabbit_user'], 59 rabbit_userid => $trove_hash['metadata']['rabbit_user'],
60 rabbit_use_ssl => false, 60 rabbit_use_ssl => false,
61 nova_proxy_admin_pass => $nova_hash['user_password'], 61 nova_proxy_admin_pass => $nova_hash['user_password'],
62 nova_proxy_admin_user => 'nova', 62 nova_proxy_admin_user => 'nova',
63 nova_proxy_admin_tenant_name => pick($nova_hash['tenant_name'], 'services'), 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 verbose => true, 82 verbose => true,
83 auth_url => "http://${service_endpoint}:5000/v2.0/", 83 auth_url => "http://${service_endpoint}:5000/v2.0/",
84 } 84 }
85 85
86 firewall { $firewall_rule : 86 firewall { $firewall_rule :
87 dport => $api_bind_port, 87 dport => $api_bind_port,
88 proto => 'tcp', 88 proto => 'tcp',
89 action => 'accept', 89 action => 'accept',
90 } 90 }
91 91
92} \ No newline at end of file 92}
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 @@
81 parameters: 81 parameters:
82 puppet_manifest: puppet/manifests/cluster.pp 82 puppet_manifest: puppet/manifests/cluster.pp
83 puppet_modules: puppet/modules:/etc/puppet/modules 83 puppet_modules: puppet/modules:/etc/puppet/modules
84 timeout: 1800 \ No newline at end of file 84 timeout: 1800