openstack
/
fuel-library
Code Issues Proposed changes

Clean up database_vip references 

Removed fallbacks to management_vip and localhost
because they are inconsistent and unnecessary.
Globals task falls back database_vip to management_vip
if it is not defined in an environment.

Change-Id: I83ea1ad4a2c6f1c3041c44e6fb91f972fd0e7037
Partial-Bug: #1476246
This commit is contained in:
Matthew Mosesohn 2015-08-03 18:01:26 +03:00
parent 1be7a6e092
commit e4b9045bdc
16 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
deployment/puppet/osnailyfacter/modular/glance/db.pp
View File

@ -13,7 +13,7 @@ $db_user = pick($glance_hash['db_user'], 'glance')
$db_name = pick($glance_hash['db_name'], 'glance')
$db_password = pick($glance_hash['db_password'], $mysql_root_password)
$db_host = pick($glance_hash['db_host'], $database_vip, 'localhost')
$db_host = pick($glance_hash['db_host'], $database_vip)
$db_create = pick($glance_hash['db_create'], $mysql_db_create)
$db_root_user = pick($glance_hash['root_user'], $mysql_root_user)
$db_root_password = pick($glance_hash['root_password'], $mysql_root_password)

2
deployment/puppet/osnailyfacter/modular/heat/db.pp
View File

@ -13,7 +13,7 @@ $db_user = pick($heat_hash['db_user'], 'heat')
$db_name = pick($heat_hash['db_name'], 'heat')
$db_password = pick($heat_hash['db_password'], $mysql_root_password)
$db_host = pick($heat_hash['db_host'], $database_vip, $management_vip, 'localhost')
$db_host = pick($heat_hash['db_host'], $database_vip)
$db_create = pick($heat_hash['db_create'], $mysql_db_create)
$db_root_user = pick($heat_hash['root_user'], $mysql_root_user)
$db_root_password = pick($heat_hash['root_password'], $mysql_root_password)

2
deployment/puppet/osnailyfacter/modular/heat/heat.pp
View File

@ -19,7 +19,7 @@ $bind_address = get_network_role_property('heat/api', 'ipaddr')
$database_password = $heat_hash['db_password']
$keystone_user = pick($heat_hash['user'], 'heat')
$keystone_tenant = pick($heat_hash['tenant'], 'services')
$db_host = pick($heat_hash['db_host'], hiera('database_vip'), $management_vip)
$db_host = pick($heat_hash['db_host'], hiera('database_vip'))
$database_user = pick($heat_hash['db_user'], 'heat')
$database_name = hiera('heat_db_name', 'heat')
$read_timeout = '60'

4
deployment/puppet/osnailyfacter/modular/keystone/db.pp
View File

@ -5,7 +5,7 @@ $network_metadata = hiera_hash('network_metadata', {})
$keystone_hash = hiera_hash('keystone', {})
$mysql_hash = hiera_hash('mysql', {})
$database_vip = hiera('database_vip', undef)
$database_vip = hiera('database_vip')
$mysql_root_user = pick($mysql_hash['root_user'], 'root')
$mysql_db_create = pick($mysql_hash['db_create'], true)
@ -15,7 +15,7 @@ $db_user = pick($keystone_hash['db_user'], 'keystone')
$db_name = pick($keystone_hash['db_name'], 'keystone')
$db_password = pick($keystone_hash['db_password'], $mysql_root_password)
$db_host = pick($keystone_hash['db_host'], $database_vip, 'localhost')
$db_host = pick($keystone_hash['db_host'], $database_vip)
$db_create = pick($keystone_hash['db_create'], $mysql_db_create)
$db_root_user = pick($keystone_hash['root_user'], $mysql_root_user)
$db_root_password = pick($keystone_hash['root_password'], $mysql_root_password)

2
deployment/puppet/osnailyfacter/modular/keystone/keystone.pp
View File

@ -13,7 +13,7 @@ $use_syslog = hiera('use_syslog', true)
$keystone_hash = hiera_hash('keystone', {})
$access_hash = hiera_hash('access',{})
$management_vip = hiera('management_vip')
$database_vip = hiera('database_vip', $management_vip)
$database_vip = hiera('database_vip')
$public_vip = hiera('public_vip')
$service_endpoint = hiera('service_endpoint')
$glance_hash = hiera_hash('glance', {})

4
deployment/puppet/osnailyfacter/modular/murano/db.pp
View File

@ -5,7 +5,7 @@ $murano_hash = hiera_hash('murano_hash', {})
$murano_enabled = pick($murano_hash['enabled'], false)
$mysql_hash = hiera_hash('mysql_hash', {})
$management_vip = hiera('management_vip', undef)
$database_vip = hiera('database_vip', undef)
$database_vip = hiera('database_vip')
$mysql_root_user = pick($mysql_hash['root_user'], 'root')
$mysql_db_create = pick($mysql_hash['db_create'], true)
@ -15,7 +15,7 @@ $db_user = pick($murano_hash['db_user'], 'murano')
$db_name = pick($murano_hash['db_name'], 'murano')
$db_password = pick($murano_hash['db_password'], $mysql_root_password)
$db_host = pick($murano_hash['db_host'], $database_vip, 'localhost')
$db_host = pick($murano_hash['db_host'], $database_vip)
$db_create = pick($murano_hash['db_create'], $mysql_db_create)
$db_root_user = pick($murano_hash['root_user'], $mysql_root_user)
$db_root_password = pick($murano_hash['root_password'], $mysql_root_password)

2
deployment/puppet/osnailyfacter/modular/murano/murano.pp
View File

@ -9,7 +9,7 @@ $heat_hash = hiera_hash('heat_hash', {})
$neutron_config = hiera_hash('neutron_config', {})
$node_role = hiera('node_role')
$public_ip = hiera('public_vip')
$database_ip = hiera('database_vip', undef)
$database_ip = hiera('database_vip')
$management_ip = hiera('management_vip')
$region = hiera('region', 'RegionOne')
$use_neutron = hiera('use_neutron', false)

2
deployment/puppet/osnailyfacter/modular/openstack-cinder/db.pp
View File

@ -13,7 +13,7 @@ $db_user = pick($cinder_hash['db_user'], 'cinder')
$db_name = pick($cinder_hash['db_name'], 'cinder')
$db_password = pick($cinder_hash['db_password'], $mysql_root_password)
$db_host = pick($cinder_hash['db_host'], $database_vip, $management_vip, 'localhost')
$db_host = pick($cinder_hash['db_host'], $database_vip)
$db_create = pick($cinder_hash['db_create'], $mysql_db_create)
$db_root_user = pick($cinder_hash['root_user'], $mysql_root_user)
$db_root_password = pick($cinder_hash['root_password'], $mysql_root_password)

2
deployment/puppet/osnailyfacter/modular/openstack-cinder/openstack-cinder.pp
View File

@ -19,7 +19,7 @@ $cinder_db_password = $cinder_hash[db_password]
$cinder_user_password = $cinder_hash[user_password]
$keystone_user = pick($cinder_hash['user'], 'cinder')
$keystone_tenant = pick($cinder_hash['tenant'], 'services')
$db_host = pick($cinder_hash['db_host'], hiera('database_vip'), $management_vip)
$db_host = pick($cinder_hash['db_host'], hiera('database_vip'))
$cinder_db_user = pick($cinder_hash['db_user'], 'cinder')
$cinder_db_name = pick($cinder_hash['db_name'], 'cinder')
$roles = node_roles($nodes_hash, hiera('uid'))

2
deployment/puppet/osnailyfacter/modular/openstack-controller/db.pp
View File

@ -13,7 +13,7 @@ $db_user = pick($nova_hash['db_user'], 'nova')
$db_name = pick($nova_hash['db_name'], 'nova')
$db_password = pick($nova_hash['db_password'], $mysql_root_password)
$db_host = pick($nova_hash['db_host'], $database_vip, $management_vip, 'localhost')
$db_host = pick($nova_hash['db_host'], $database_vip)
$db_create = pick($nova_hash['db_create'], $mysql_db_create)
$db_root_user = pick($nova_hash['root_user'], $mysql_root_user)
$db_root_password = pick($nova_hash['root_password'], $mysql_root_password)

2
deployment/puppet/osnailyfacter/modular/openstack-controller/openstack-controller.pp
View File

@ -33,7 +33,7 @@ $ceilometer_hash = hiera_hash('ceilometer',{})
$syslog_log_facility_ceph = hiera('syslog_log_facility_ceph','LOG_LOCAL0')
$workloads_hash = hiera_hash('workloads_collector', {})
$service_endpoint = hiera('service_endpoint')
$db_host = pick($nova_hash['db_host'], hiera('database_vip'), $management_vip)
$db_host = pick($nova_hash['db_host'], hiera('database_vip'))
$nova_db_user = pick($nova_hash['db_user'], 'nova')
$keystone_user = pick($nova_hash['user'], 'nova')
$keystone_tenant = pick($nova_hash['tenant'], 'services')

2
deployment/puppet/osnailyfacter/modular/openstack-network/db.pp
View File

@ -17,7 +17,7 @@ $db_user = pick($neutron_db['db_user'], 'neutron')
$db_name = pick($neutron_db['db_name'], 'neutron')
$db_password = pick($neutron_db['passwd'], $mysql_root_password)
$db_host = pick($neutron_db['db_host'], $database_vip, 'localhost')
$db_host = pick($neutron_db['db_host'], $database_vip)
$db_create = pick($neutron_db['db_create'], $mysql_db_create)
$db_root_user = pick($neutron_db['root_user'], $mysql_root_user)
$db_root_password = pick($neutron_db['root_password'], $mysql_root_password)

2
deployment/puppet/osnailyfacter/modular/openstack-network/openstack-network-controller.pp
View File

@ -40,7 +40,7 @@ if $use_neutron {
$neutron_db_password = $neutron_config['database']['passwd']
$neutron_db_user = pick($neutron_config['database']['user'], 'neutron')
$neutron_db_name = pick($neutron_config['database']['name'], 'neutron')
$neutron_db_host = pick($neutron_config['database']['host'], hiera('database_vip'), $management_vip)
$neutron_db_host = pick($neutron_config['database']['host'], hiera('database_vip'))
$base_mac = $neutron_config['L2']['base_mac']
} else {
$network_provider = 'nova'

2
deployment/puppet/osnailyfacter/modular/roles/cinder.pp
View File

@ -42,7 +42,7 @@ $syslog_log_facility_ceph = hiera('syslog_log_facility_ceph','LOG_LOCAL0')
$cinder_db_password = $cinder_hash[db_password]
$keystone_user = pick($cinder_hash['user'], 'cinder')
$keystone_tenant = pick($cinder_hash['tenant'], 'services')
$db_host = pick($cinder_hash['db_host'], hiera('database_vip'), $management_vip)
$db_host = pick($cinder_hash['db_host'], hiera('database_vip'))
$cinder_db_user = pick($cinder_hash['db_user'], 'cinder')
$cinder_db_name = pick($cinder_hash['db_name'], 'cinder')

6
deployment/puppet/osnailyfacter/modular/roles/compute.pp
View File

@ -9,6 +9,7 @@ $node_name = hiera('node_name')
$public_int = hiera('public_int', undef)
$public_vip = hiera('public_vip')
$management_vip = hiera('management_vip')
$database_vip = hiera('database_vip')
$service_endpoint = hiera('service_endpoint')
$internal_address = get_network_role_property('nova/api', 'ipaddr')
$primary_controller = hiera('primary_controller')
@ -52,6 +53,7 @@ $nova_report_interval = hiera('nova_report_interval')
$nova_service_down_time = hiera('nova_service_down_time')
$glance_api_servers = hiera('glance_api_servers', "${management_vip}:9292")
$db_host = pick($nova_hash['db_host'], $database_vip)
$block_device_allocate_retries = hiera('block_device_allocate_retries', 300)
$block_device_allocate_retries_interval = hiera('block_device_allocate_retries_interval', 3)
@ -242,7 +244,7 @@ class { 'openstack::compute':
network_manager => hiera('network_manager', undef),
network_config => hiera('network_config', {}),
multi_host => $multi_host,
database_connection => "mysql://nova:${nova_hash[db_password]}@${management_vip}/nova?read_timeout=60",
database_connection => "mysql://nova:${nova_hash[db_password]}@${db_host}/nova?read_timeout=60",
queue_provider => $queue_provider,
amqp_hosts => hiera('amqp_hosts',''),
amqp_user => $rabbit_hash['user'],
@ -269,7 +271,7 @@ class { 'openstack::compute':
ceilometer => $ceilometer_hash[enabled],
ceilometer_metering_secret => $ceilometer_hash[metering_secret],
ceilometer_user_password => $ceilometer_hash[user_password],
db_host => $management_vip,
db_host => $db_host,
network_provider => $network_provider,
neutron_user_password => $use_neutron ? { true=>$neutron_config['keystone']['admin_password'], default=>undef},
base_mac => $base_mac,

2
deployment/puppet/osnailyfacter/modular/sahara/db.pp
View File

@ -15,7 +15,7 @@ $db_user = pick($sahara_hash['db_user'], 'sahara')
$db_name = pick($sahara_hash['db_name'], 'sahara')
$db_password = pick($sahara_hash['db_password'], $mysql_root_password)
$db_host = pick($sahara_hash['db_host'], $database_vip, 'localhost')
$db_host = pick($sahara_hash['db_host'], $database_vip)
$db_create = pick($sahara_hash['db_create'], $mysql_db_create)
$db_root_user = pick($sahara_hash['root_user'], $mysql_root_user)
$db_root_password = pick($sahara_hash['root_password'], $mysql_root_password)