Merge "Move workloads_collector_user_add to keystone role"

This commit is contained in:
Jenkins 2015-10-23 12:19:21 +00:00 committed by Gerrit Code Review
commit 0f3eb3257d

View File

@ -69,6 +69,16 @@
test_post: test_post:
cmd: ruby /etc/puppet/modules/osnailyfacter/modular/keystone/keystone_post.rb cmd: ruby /etc/puppet/modules/osnailyfacter/modular/keystone/keystone_post.rb
- id: task-workloads_collector_add
type: puppet
role: [primary-standalone-keystone, standalone-keystone]
requires: [task-keystone]
required_for: [post_deployment_end]
parameters:
puppet_manifest: /etc/puppet/modules/osnailyfacter/modular/keystone/workloads_collector_add.pp
puppet_modules: /etc/puppet/modules
timeout: 1800
- id: disable_standalone_keystone_service_token - id: disable_standalone_keystone_service_token
type: puppet type: puppet
role: [primary-standalone-keystone, standalone-keystone] role: [primary-standalone-keystone, standalone-keystone]
@ -102,6 +112,9 @@
- id: openstack-haproxy-keystone - id: openstack-haproxy-keystone
type: skipped type: skipped
- id: workloads_collector_add
type: skipped
- id: disable_keystone_service_token - id: disable_keystone_service_token
type: skipped type: skipped
@ -116,4 +129,3 @@
puppet_manifest: 'hiera-override.pp' puppet_manifest: 'hiera-override.pp'
puppet_modules: '/etc/puppet/modules' puppet_modules: '/etc/puppet/modules'
timeout: 120 timeout: 120