x
/
fuel-plugin-dbaas-trove
Code Issues Proposed changes

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
This commit is contained in:
Brian Hunter 2016-03-31 13:13:26 -04:00
parent 219f2ff75d
commit 03978183bf
4 changed files with 35 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
deployment_scripts/puppet/manifests/haproxy.pp
View File

@ -13,36 +13,36 @@ if ($use_trove) {
$ipaddresses = hiera_array('trove_ipaddresses', values($troves_address_map)) $ipaddresses = hiera_array('trove_ipaddresses', values($troves_address_map))
$public_virtual_ip = hiera('public_vip') $public_virtual_ip = hiera('public_vip')
$internal_virtual_ip = hiera('management_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': # configure trove ha proxy
order => '210', Openstack::Ha::Haproxy_service {
listen_port => 8779, internal_virtual_ip => $internal_virtual_ip,
internal => true, ipaddresses => $ipaddresses,
public => true, public_virtual_ip => $public_virtual_ip,
} server_names => $server_names,
public_ssl => $public_ssl_hash['services'],
}
openstack::ha::haproxy_service { 'trove-rabbitmq': openstack::ha::haproxy_service { 'trove-api':
order => '211', order => '210',
listen_port => 55671, listen_port => 8779,
define_backups => true, internal => true,
internal => true, public => true,
public => true, }
haproxy_config_options => {
'option' => ['tcpka'], openstack::ha::haproxy_service { 'trove-rabbitmq':
'timeout client' => '48h', order => '211',
'timeout server' => '48h', listen_port => 55671,
'balance' => 'roundrobin', define_backups => true,
'mode' => 'tcp' internal => true,
}, public => true,
balancermember_options => 'check inter 5000 rise 2 fall 3', haproxy_config_options => {
} 'option' => ['tcpka'],
'timeout client' => '48h',
'timeout server' => '48h',
'balance' => 'roundrobin',
'mode' => 'tcp'
},
balancermember_options => 'check inter 5000 rise 2 fall 3',
}
} }

2
deployment_scripts/puppet/manifests/keystone.pp
View File

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

6
deployment_scripts/puppet/manifests/trove.pp
View File

@ -59,7 +59,7 @@ if $trove_hash['metadata']['enabled'] {
rabbit_userid => $trove_hash['metadata']['rabbit_user'], rabbit_userid => $trove_hash['metadata']['rabbit_user'],
rabbit_use_ssl => false, rabbit_use_ssl => false,
nova_proxy_admin_pass => $nova_hash['user_password'], 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'), nova_proxy_admin_tenant_name => pick($nova_hash['tenant_name'], 'services'),
} }
@ -82,11 +82,11 @@ if $trove_hash['metadata']['enabled'] {
verbose => true, verbose => true,
auth_url => "http://${service_endpoint}:5000/v2.0/", auth_url => "http://${service_endpoint}:5000/v2.0/",
} }
firewall { $firewall_rule : firewall { $firewall_rule :
dport => $api_bind_port, dport => $api_bind_port,
proto => 'tcp', proto => 'tcp',
action => 'accept', action => 'accept',
} }
} }

2
deployment_tasks.yaml
View File

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