openstack/fuel-library
Code Issues Proposed changes

Merge "Set dns extension driver" into stable/mitaka

Browse Source
This commit is contained in:
Jenkins 2016-12-03 10:49:58 +00:00 committed by Gerrit Code Review
commit 5c437109f5
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
deployment/puppet/openstack_tasks/manifests/openstack_network/server_config.pp
View File

@ -83,10 +83,10 @@ class openstack_tasks::openstack_network::server_config {
if $enable_qos {
$qos_notification_drivers = 'message_queue'
$extension_drivers = ['port_security', 'qos']
$extension_drivers = ['dns', 'port_security', 'qos']
} else {
$qos_notification_drivers = undef
$extension_drivers = ['port_security']
$extension_drivers = ['dns', 'port_security']
}
$nova_auth_user = pick($nova_hash['user'], 'nova')

2
tests/noop/spec/hosts/openstack-network/server-config_spec.rb
View File

@ -27,7 +27,7 @@ describe manifest do
service_endpoint = Noop.hiera('service_endpoint', management_vip)
l3_ha = Noop.hiera_hash('neutron_advanced_configuration', {}).fetch('neutron_l3_ha', false)
sync_db = Noop.puppet_function('has_primary_role', Noop.puppet_function('intersection', Noop.hiera('neutron_roles'), Noop.hiera('roles')))
extension_drivers = ['port_security']
extension_drivers = ['dns','port_security']
segmentation_type = neutron_config.fetch('L2',{}).fetch('segmentation_type')
pnets = neutron_config.fetch('L2',{}).fetch('phys_nets',{})
role = Noop.hiera('role')