From 7dfd0e20f98e44d3d8230b95f88f3bbac363fa70 Mon Sep 17 00:00:00 2001 From: Matthew Mosesohn Date: Wed, 21 Oct 2015 13:45:52 +0300 Subject: [PATCH] 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 --- deployment_tasks.yaml | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/deployment_tasks.yaml b/deployment_tasks.yaml index 2ededbc..da4bdbb 100644 --- a/deployment_tasks.yaml +++ b/deployment_tasks.yaml @@ -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 -