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:
parent
219f2ff75d
commit
03978183bf
|
@ -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',
|
||||
}
|
||||
}
|
||||
|
|
|
@ -41,4 +41,4 @@ class { 'trove::keystone::auth':
|
|||
admin_url => $admin_url,
|
||||
region => $region,
|
||||
tenant => $tenant,
|
||||
}
|
||||
}
|
||||
|
|
|
@ -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',
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
|
|
@ -81,4 +81,4 @@
|
|||
parameters:
|
||||
puppet_manifest: puppet/manifests/cluster.pp
|
||||
puppet_modules: puppet/modules:/etc/puppet/modules
|
||||
timeout: 1800
|
||||
timeout: 1800
|
||||
|
|
Loading…
Reference in New Issue