Skip to content
This repository has been archived by the owner on May 14, 2019. It is now read-only.

Allow user to decide whether to configure keystone user/role/endpint for neutron service #221

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Allow user to decide whether to configure keystone user/role/endpint for neutron service #221

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions examples/allinone.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,10 @@ openstack::neutron::shared_secret: 'by-sa-bo'
openstack::neutron::core_plugin: 'ml2'
openstack::neutron::service_plugins: ['router', 'firewall', 'lbaas', 'vpnaas', 'metering']

openstack::neutron::config_endpoint: true
openstack::neutron::config_user: true
openstack::neutron::config_user_role: true

######## Ceilometer
openstack::ceilometer::address::management: '172.16.33.4'
openstack::ceilometer::mongo::username: 'mongo'
Expand Down
4 changes: 4 additions & 0 deletions examples/common.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,10 @@ openstack::neutron::shared_secret: 'by-sa-bo'
openstack::neutron::core_plugin: 'ml2'
openstack::neutron::service_plugins: ['router', 'firewall', 'lbaas', 'vpnaas', 'metering']

openstack::neutron::config_endpoint: true
openstack::neutron::config_user: true
openstack::neutron::config_user_role: true

######## Ceilometer
openstack::ceilometer::address::management: '172.16.33.4'
openstack::ceilometer::mongo::username: 'mongo'
Expand Down
13 changes: 8 additions & 5 deletions manifests/common/neutron.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,14 @@
}

class { '::neutron::keystone::auth':
password => $::openstack::config::neutron_password,
public_address => $::openstack::config::controller_address_api,
admin_address => $::openstack::config::controller_address_management,
internal_address => $::openstack::config::controller_address_management,
region => $::openstack::config::region,
configure_endpoint => $::openstack::config::neutron_config_endpoint,
configure_user => $::openstack::config::neutron_config_user,
configure_user_role => $::openstack::config::neutron_config_user_role,
password => $::openstack::config::neutron_password,
public_address => $::openstack::config::controller_address_api,
admin_address => $::openstack::config::controller_address_management,
internal_address => $::openstack::config::controller_address_management,
region => $::openstack::config::region,
}

class { '::neutron::server':
Expand Down
3 changes: 3 additions & 0 deletions manifests/config.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,9 @@
$neutron_type_drivers = undef,
$neutron_mechanism_drivers = undef,
$neutron_tunnel_id_ranges = undef,
$neutron_config_endpoint = undef,
$neutron_config_user = undef,
$neutron_config_user_role = undef,
$plumgrid_director_vip = undef,
$plumgrid_username = undef,
$plumgrid_password = undef,
Expand Down
21 changes: 21 additions & 0 deletions manifests/init.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,6 +276,18 @@
# Neutron tunnel id ranges.
# Defaults to ['1:1000']
#
# [*neutron_config_keystone_endpoint*]
# Boolean. Whether to config keystone endpoint for Neutron.
# Default to true
#
# [*neutron_config_keystone_user*]
# Boolean. Whether to config keystone user for Neutron.
# Default to true
#
# [*neutron_config_keystone_user_role*]
# Boolean. Whether to config keystone user role for Neutron.
# Default to true
#
# == Ceilometer
# [*ceilometer_address_management*]
# The management IP address of the ceilometer node. Must be in the network_management CIDR.
Expand Down Expand Up @@ -434,6 +446,9 @@
$neutron_type_drivers = ['gre'],
$neutron_mechanism_drivers = ['openvswitch'],
$neutron_tunnel_id_ranges = ['1:1000'],
$neutron_config_endpoint = true,
$neutron_config_user = true,
$neutron_config_user_role = true,
$ceilometer_address_management = undef,
$ceilometer_mongo_username = undef,
$ceilometer_mongo_password = undef,
Expand Down Expand Up @@ -523,6 +538,9 @@
neutron_type_drivers => hiera(openstack::neutron::neutron_type_drivers, $neutron_type_drivers),
neutron_mechanism_drivers => hiera(openstack::neutron::neutron_mechanism_drivers, $neutron_mechanism_drivers),
neutron_tunnel_id_ranges => hiera(openstack::neutron::neutron_tunnel_id_ranges, $neutron_tunnel_id_ranges),
neutron_config_endpoint => hiera(openstack::neutron::config_endpoint),
neutron_config_user => hiera(openstack::neutron::config_user),
neutron_config_user_role => hiera(openstack::neutron::config_user_role),
ceilometer_address_management => hiera(openstack::ceilometer::address::management),
ceilometer_mongo_username => hiera(openstack::ceilometer::mongo::username),
ceilometer_mongo_password => hiera(openstack::ceilometer::mongo::password),
Expand Down Expand Up @@ -617,6 +635,9 @@
neutron_type_drivers => $neutron_type_drivers,
neutron_mechanism_drivers => $neutron_mechanism_drivers,
neutron_tunnel_id_ranges => $neutron_tunnel_id_ranges,
neutron_config_endpoint => $neutron_config_endpoint,
neutron_config_user => $neutron_config_user,
neutron_config_user_role => $neutron_config_user_role,
ceilometer_address_management => $ceilometer_address_management,
ceilometer_mongo_username => $ceilometer_mongo_username,
ceilometer_mongo_password => $ceilometer_mongo_password,
Expand Down