Move workloads_collector_user_add to keystone role

Upstream moved this task to a separate task from keystone
base task, so reflecting this change in keystone role via
plugin.

Change-Id: Ib46c79a7bac7c971d997e78f589e879f4e2143a6
Closes-Bug: #1508078
This commit is contained in:
Matthew Mosesohn 2015-10-21 13:45:52 +03:00
parent d7b5d77422
commit 7dfd0e20f9
1 changed files with 14 additions and 2 deletions

View File

@ -69,12 +69,22 @@
test_post:
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
type: puppet
role: [primary-standalone-keystone, standalone-keystone]
requires: [task-keystone]
required_for: [post_deployment_end]
parameters:
parameters:
puppet_manifest: /etc/puppet/modules/osnailyfacter/modular/astute/service_token_off.pp
puppet_modules: /etc/puppet/modules
timeout: 180
@ -102,6 +112,9 @@
- id: openstack-haproxy-keystone
type: skipped
- id: workloads_collector_add
type: skipped
- id: disable_keystone_service_token
type: skipped
@ -116,4 +129,3 @@
puppet_manifest: 'hiera-override.pp'
puppet_modules: '/etc/puppet/modules'
timeout: 120