openstack/puppet-openstack-integration
Code Issues Proposed changes

Merge "Use keystone::bootstrap"

Browse Source
This commit is contained in:
Zuul 2020-01-09 11:40:38 +00:00 committed by Gerrit Code Review
commit c04064e289
2 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
manifests/keystone.pp
View File

@ -60,8 +60,6 @@ class openstack_integration::keystone (
} }
class { 'keystone': class { 'keystone':
database_connection => 'mysql+pymysql://keystone:keystone@127.0.0.1/keystone', database_connection => 'mysql+pymysql://keystone:keystone@127.0.0.1/keystone',
admin_token => 'a_big_token',
admin_password => 'a_big_secret',
enabled => true, enabled => true,
service_name => 'httpd', service_name => 'httpd',
default_domain => $default_domain, default_domain => $default_domain,
@ -101,15 +99,19 @@ class openstack_integration::keystone (
ssl_cert => $::openstack_integration::params::cert_path, ssl_cert => $::openstack_integration::params::cert_path,
workers => 2, workers => 2,
} }
class { 'keystone::roles::admin': class { 'keystone::bootstrap':
email => 'test@example.tld', password => 'a_big_secret',
password => 'a_big_secret', email => 'test@example.tld',
public_url => $::openstack_integration::config::keystone_auth_uri,
admin_url => $::openstack_integration::config::keystone_admin_uri,
} }
class { 'keystone::endpoint': keystone_tenant { 'openstack':
default_domain => $default_domain, ensure => 'present',
public_url => $::openstack_integration::config::keystone_auth_uri, enabled => true,
admin_url => $::openstack_integration::config::keystone_admin_uri, }
version => '', keystone_user_role { "${::keystone::bootstrap::username}@openstack":
ensure => 'present',
roles => [$::keystone::bootstrap::role_name],
} }
class { 'openstack_extras::auth_file': class { 'openstack_extras::auth_file':

6
manifests/provision.pp
View File

@ -14,9 +14,9 @@
# Default to true. # Default to true.
# #
class openstack_integration::provision ( class openstack_integration::provision (
$glance = true, $glance = true,
$nova = true, $nova = true,
$neutron = true, $neutron = true,
){ ){
include openstack_integration::config include openstack_integration::config