openstack/puppet-neutron
Code Issues Proposed changes

Add MidoNet plugin client parameter

Browse Source 
This configuration parameter is necessary only for the Newton release. Hence
that's why I am not backporting this change from master.

Change-Id: I83e88fbc560ade512681be6e0b447fe038ff240f
This commit is contained in:
Alejandro Andreu 2017-02-10 10:26:00 +01:00
parent 215990ecc0
commit 374d1a3c4f
1 changed files with 24 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
manifests/plugins/midonet.pp
View File

@ -9,21 +9,27 @@
#
# [*midonet_api_ip*]
# IP address of the MidoNet api service
#
# [*midonet_api_port*]
# IP address of the MidoNet port service. MidoNet runs in a Tomcat, so 8080
# is used by default.
#
# [*keystone_username*]
# Username from which midonet api will authenticate against Keystone (neutron
# service is desirable and defaulted)
#
# [*keystone_password*]
# Password from which midonet api will authenticate against Keystone
# Defaults to $::os_service_default
#
# [*keystone_tenant*]
# Tenant from which midonet api will authenticate against Keystone (services
# tenant is desirable and defaulted)
#
# [*sync_db*]
# Whether 'midonet-db-manage' should run to create and/or syncrhonize the database
# with MidoNet specific tables. Defaults to false
# Whether 'midonet-db-manage' should run to create and/or sync the database
# with MidoNet specific tables.
# Defaults to false
#
# [*purge_config*]
# (optional) Whether to set only the specified config options
@ -31,9 +37,14 @@
# Defaults to false.
#
# [*package_ensure*]
# Whether to install the latest package, or a version for midonet plugin
# Whether to install the latest package, or a specifi version of the
# MidoNet plugin
# Defaults to 'present'.
#
# [*midonet_plugin_client*]
# Client to be configured for the MidoNet Neutron plugin.
# Defaults to 'midonet_ext.neutron.client.api.MidonetApiClient'
#
# === Examples
#
# An example call would be:
@ -76,14 +87,15 @@
# limitations under the License.
#
class neutron::plugins::midonet (
$midonet_api_ip = '127.0.0.1',
$midonet_api_port = '8080',
$keystone_username = 'neutron',
$keystone_password = $::os_service_default,
$keystone_tenant = 'services',
$sync_db = false,
$purge_config = false,
$package_ensure = 'present'
$midonet_api_ip = '127.0.0.1',
$midonet_api_port = '8080',
$keystone_username = 'neutron',
$keystone_password = $::os_service_default,
$keystone_tenant = 'services',
$sync_db = false,
$purge_config = false,
$package_ensure = 'present',
$midonet_plugin_client = 'midonet_ext.neutron.client.api.MidonetApiClient'
) {
include ::neutron::deps
@ -117,6 +129,7 @@ class neutron::plugins::midonet (
'MIDONET/username': value => $keystone_username;
'MIDONET/password': value => $keystone_password, secret =>true;
'MIDONET/project_id': value => $keystone_tenant;
'MIDONET/client': value => $midonet_plugin_client;
}
if $::osfamily == 'Debian' {