x
/
fuel-plugin-opendaylight
Code Issues Proposed changes

Change hiera overrides default behaviour and apply them in manifest 

Change default behaviour (do not create them) of resource overrides.
Produce override with resource creation during ML2 plugin configuration.

Change-Id: I8ccb4bfe8e788cd171bafde125903d91aa31b59e
Partial-bug: 1648349
This commit is contained in:
Igor Zinovik 2016-12-30 15:03:30 +03:00
parent 0574e57f39
commit a18c785bc2
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
deployment_scripts/puppet/manifests/odl-ml2-configuration.pp
View File

@ -3,6 +3,15 @@ notice('MODULAR: odl-ml2.pp')
class neutron {}
class { 'neutron' :}
$override_configuration = hiera_hash(configuration, {})
$override_configuration_options = { create => true }
override_resources { 'odl-ml2-override':
configuration => $override_configuration,
options => $override_configuration_options,
}
include ::neutron::params
$node_name = hiera('node_name')
@ -36,6 +45,9 @@ $auth_endpoint_type = 'internalURL'
# Synchronize database after plugin was configured
if $primary_controller {
include ::neutron::db::sync
Override_resources['odl-ml2-override'] -> Exec['neutron-db-sync']
notify{"Trigger neutron-db-sync": } ~> Exec['neutron-db-sync']
}

1
deployment_scripts/puppet/modules/opendaylight/lib/puppet/parser/functions/odl_hiera_overrides.rb
View File

@ -49,6 +49,7 @@ module Puppet::Parser::Functions
configuration.merge! l3_agent
configuration.merge! dhcp_agent
hiera_overrides['configuration'] = configuration
hiera_overrides['configuration_options'] = { 'create' => false }
# override neutron_config/quantum_settings
neutron_config['L2']['mechanism_drivers'] = 'opendaylight'