Merge "Update keystone db task to wait for all databases"

deployment/puppet/osnailyfacter/modular/database/tasks.yaml

@@ -7,8 +7,6 @@
   reexecute_on: [deploy_changes]
   cross-depends:
     - name: primary-database
-  strategy:
-    type: one_by_one
   parameters:
     puppet_manifest: /etc/puppet/modules/osnailyfacter/modular/database/database.pp
     puppet_modules: /etc/puppet/modules

deployment/puppet/osnailyfacter/modular/keystone/tasks.yaml

@@ -58,7 +58,6 @@
   requires: [primary-database, database]
   cross-depends:
     - name: /(primary-)?database/
-      role: self
   parameters:
     puppet_manifest: /etc/puppet/modules/osnailyfacter/modular/keystone/db.pp
     puppet_modules: /etc/puppet/modules