openstack/puppet-openstack-integration
Code Issues Proposed changes

Merge "disabling the admin_token after bootstrap"

Browse Source
This commit is contained in:
Jenkins 2016-02-17 21:17:34 +00:00 committed by Gerrit Code Review
commit b10a217adb
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
manifests/keystone.pp
View File

@ -43,5 +43,16 @@ class openstack_integration::keystone (
class { '::keystone::endpoint':
default_domain => $default_domain,
}
class { '::keystone::disable_admin_token_auth': }
if $default_domain {
$default_domain_real = $default_domain
} else {
$default_domain_real = 'default'
}
class { '::openstack_extras::auth_file':
password => 'a_big_secret',
project_domain => $default_domain_real,
user_domain => $default_domain_real,
}
}

1
manifests/provision.pp
View File

@ -88,4 +88,5 @@ class openstack_integration::provision {
# source => '/home/jenkins/cache/files/cirros-0.3.4-x86_64-disk.img',
source => 'http://download.cirros-cloud.net/0.3.4/cirros-0.3.4-x86_64-disk.img',
}
Keystone_user_role['admin@openstack'] -> Glance_image<||>
}