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
This commit is contained in:
Alex Schultz 2016-06-22 12:34:04 -06:00
parent fa7d4daf68
commit 2c04b04345
2 changed files with 1 additions and 5 deletions

View File

@ -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.

View File

@ -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