Possibility to detach haproxy from controllers
- Added possibility to use custom_mysql_setup_class for database - Added possibility to overwrite controllers role with haproxy_nodes Partial blueprint: detach-components-from-controllers Change-Id: Ic76a6d7b7211e03dd5447a71b3c51ad5bb074dbe Co-Authored-By: Nikita Koshikov <nkoshikov@mirantis.com>
This commit is contained in:
parent
7d19bc3783
commit
a56d95bd98
@ -66,7 +66,7 @@ class openstack::ha::haproxy (
|
||||
}
|
||||
}
|
||||
|
||||
if $custom_mysql_setup_class == 'galera' or $custom_mysql_setup_class == 'percona' {
|
||||
if ($custom_mysql_setup_class in ['galera', 'percona', 'percona_packages']) {
|
||||
class { 'openstack::ha::mysqld':
|
||||
is_primary_controller => $is_primary_controller,
|
||||
server_names => hiera_array('mysqld_names', $controllers_server_names),
|
||||
|
@ -1,11 +1,12 @@
|
||||
notice('MODULAR: openstack-haproxy.pp')
|
||||
|
||||
$use_neutron = hiera('use_neutron', false)
|
||||
$ceilometer_hash = hiera('ceilometer',{})
|
||||
$sahara_hash = hiera('sahara', {})
|
||||
$murano_hash = hiera('murano', {})
|
||||
$storage_hash = hiera('storage', {})
|
||||
$ceilometer_hash = hiera_hash('ceilometer',{})
|
||||
$sahara_hash = hiera_hash('sahara', {})
|
||||
$murano_hash = hiera_hash('murano', {})
|
||||
$storage_hash = hiera_hash('storage', {})
|
||||
$controllers = hiera('controllers')
|
||||
$haproxy_nodes = hiera('haproxy_nodes', $controllers)
|
||||
|
||||
if !($storage_hash['images_ceph'] and $storage_hash['objects_ceph']) and !$storage_hash['images_vcenter'] {
|
||||
$use_swift = true
|
||||
@ -14,19 +15,19 @@ if !($storage_hash['images_ceph'] and $storage_hash['objects_ceph']) and !$stora
|
||||
}
|
||||
|
||||
if ($use_swift) {
|
||||
$swift_proxies = $controllers
|
||||
$swift_proxies = hiera('swift_proxies', $haproxy_nodes)
|
||||
} elsif ($storage_hash['objects_ceph']) {
|
||||
$rgw_servers = $controllers
|
||||
$rgw_servers = hiera('rgw_servers', $controllers)
|
||||
}
|
||||
|
||||
class { '::openstack::ha::haproxy':
|
||||
controllers => $controllers,
|
||||
controllers => $haproxy_nodes,
|
||||
public_virtual_ip => hiera('public_vip'),
|
||||
internal_virtual_ip => hiera('management_vip'),
|
||||
horizon_use_ssl => hiera('horizon_use_ssl', false),
|
||||
neutron => $use_neutron,
|
||||
queue_provider => 'rabbitmq',
|
||||
custom_mysql_setup_class => 'galera',
|
||||
custom_mysql_setup_class => hiera('custom_mysql_setup_class','galera'),
|
||||
swift_proxies => $swift_proxies,
|
||||
rgw_servers => $rgw_servers,
|
||||
ceilometer => $ceilometer_hash['enabled'],
|
||||
|
Loading…
Reference in New Issue
Block a user