x
/
packstack
Code Issues Proposed changes

Merge "Fix several deprecation warnings"

This commit is contained in:
Jenkins 2016-12-22 11:34:42 +00:00 committed by Gerrit Code Review
parent 2abee9bcae cfce8bd20f
commit 79f4846d95
5 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
packstack/puppet/modules/packstack/manifests/glance.pp
View File

@ -18,6 +18,10 @@ class packstack::glance ()
default => '0.0.0.0',
# TO-DO(mmagr): Add IPv6 support when hostnames are used
}
$default_store = hiera('CONFIG_GLANCE_BACKEND') ? {
'swift' => 'swift',
default => 'file',
}
class { '::glance::api::authtoken':
auth_uri => hiera('CONFIG_KEYSTONE_PUBLIC_URL'),
@ -33,7 +37,8 @@ class packstack::glance ()
debug => hiera('CONFIG_DEBUG_MODE'),
os_region_name => hiera('CONFIG_KEYSTONE_REGION'),
workers => hiera('CONFIG_SERVICE_WORKERS'),
known_stores => ['file', 'http', 'swift']
stores => ['file', 'http', 'swift'],
default_store => $default_store,
}
class { '::glance::registry::authtoken':

1
packstack/puppet/modules/packstack/manifests/keystone.pp
View File

@ -36,6 +36,7 @@ class packstack::keystone ()
class { '::keystone':
admin_token => hiera('CONFIG_KEYSTONE_ADMIN_TOKEN'),
admin_password => hiera('CONFIG_KEYSTONE_ADMIN_PW'),
database_connection => "mysql+pymysql://keystone_admin:${keystone_cfg_ks_db_pw}@${keystone_cfg_mariadb_host}/keystone",
token_provider => "${keystone_token_provider_str}",
enable_fernet_setup => $enable_fernet_setup,

2
packstack/puppet/modules/packstack/manifests/nova.pp
View File

@ -53,5 +53,7 @@ class packstack::nova ()
notify_on_state_change => $notify_on_state_change,
database_connection => "mysql+pymysql://nova:${nova_db_pw}@${nova_mariadb_host}/nova",
api_database_connection => "mysql+pymysql://nova_api:${nova_db_pw}@${nova_mariadb_host}/nova_api",
cpu_allocation_ratio => hiera('CONFIG_NOVA_SCHED_CPU_ALLOC_RATIO'),
ram_allocation_ratio => hiera('CONFIG_NOVA_SCHED_RAM_ALLOC_RATIO'),
}
}

12
packstack/puppet/modules/packstack/manifests/nova/neutron.pp
View File

@ -4,13 +4,13 @@ class packstack::nova::neutron ()
$neutron_auth_url = hiera('CONFIG_KEYSTONE_ADMIN_URL')
class { '::nova::network::neutron':
neutron_password => hiera('CONFIG_NEUTRON_KS_PW'),
neutron_auth_plugin => 'v3password',
neutron_url => "http://${nova_neutron_cfg_ctrl_host}:9696",
neutron_password => hiera('CONFIG_NEUTRON_KS_PW'),
neutron_auth_type => 'v3password',
neutron_url => "http://${nova_neutron_cfg_ctrl_host}:9696",
neutron_project_name => 'services',
neutron_auth_url => "${neutron_auth_url}/v3",
neutron_region_name => hiera('CONFIG_KEYSTONE_REGION'),
neutron_url_timeout => '60',
neutron_auth_url => "${neutron_auth_url}/v3",
neutron_region_name => hiera('CONFIG_KEYSTONE_REGION'),
neutron_url_timeout => '60',
}
class { '::nova::compute::neutron':

2
packstack/puppet/modules/packstack/manifests/nova/sched.pp
View File

@ -7,8 +7,6 @@ class packstack::nova::sched ()
'ComputeCapabilitiesFilter', 'ImagePropertiesFilter',
'ServerGroupAntiAffinityFilter',
'ServerGroupAffinityFilter', 'CoreFilter'],
cpu_allocation_ratio => hiera('CONFIG_NOVA_SCHED_CPU_ALLOC_RATIO'),
ram_allocation_ratio => hiera('CONFIG_NOVA_SCHED_RAM_ALLOC_RATIO'),
}
class { '::nova::scheduler':