Merge "Adapt disable keystone service token for plugin"

This commit is contained in:
Jenkins 2015-09-03 10:53:09 +00:00 committed by Gerrit Code Review
commit ef411c1d73
1 changed files with 14 additions and 0 deletions

View File

@ -69,6 +69,17 @@
test_post:
cmd: ruby /etc/puppet/modules/osnailyfacter/modular/keystone/keystone_post.rb
- id: disable_standalone_keystone_service_token
type: puppet
role: [primary-standalone-keystone, standalone-keystone]
requires: [task-keystone]
required_for: [post_deployment_end]
parameters:
puppet_manifest: /etc/puppet/modules/osnailyfacter/modular/astute/service_token_off.pp
puppet_modules: /etc/puppet/modules
timeout: 180
cwd: /
- id: keystone-controller
type: puppet
groups: [primary-controller, controller]
@ -91,6 +102,9 @@
- id: openstack-haproxy-keystone
type: skipped
- id: disable_keystone_service_token
type: skipped
- id: keystone-hiera-override
type: puppet
groups: [primary-controller, controller, primary-standalone-keystone,