From 2c04b0434599c02af7f90a3ff0912edc39d5ecc2 Mon Sep 17 00:00:00 2001 From: Alex Schultz Date: Wed, 22 Jun 2016 12:34:04 -0600 Subject: [PATCH] Wait for all database tasks This change updates the cross depends for the keystone-db task to ensure all database tasks are run prior to running keystone db creation. Previously we were only waiting for the primary controller database tasks but if this plugin is used in conjunction with the detached-database plugin on a different host it could cause failures. Change-Id: I4e1068306c7b8d568e41acdcf0692b6c75e5b04f Closes-Bug: #1595219 --- README.md | 3 --- deployment_tasks.yaml | 3 +-- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/README.md b/README.md index d4618db..4cdd33c 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,2 @@ # detach-keystone Plugin to detach Keystone from controller role - -Because of limitations in Fuel's granular deployment and keystone's DB dependency, -this plugin must be installed and activated alongside with the detach-database plugin. diff --git a/deployment_tasks.yaml b/deployment_tasks.yaml index 08bb39c..fce5fb3 100644 --- a/deployment_tasks.yaml +++ b/deployment_tasks.yaml @@ -137,8 +137,7 @@ required_for: [keystone, primary-keystone] requires: [hosts] cross-depends: - - name: /(primary-)?database/ - role: primary-controller + - name: /^(primary-)?database$/ parameters: puppet_manifest: /etc/puppet/modules/osnailyfacter/modular/keystone/db.pp puppet_modules: /etc/puppet/modules