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

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

@ -14,35 +14,35 @@ if ($use_trove) {
$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'],
}
# 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,
}
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',
}
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',
}
}

2
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_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'),
}