Merge "Fix *-db tasks for detached service plugins"

deployment/puppet/openstack_tasks/examples/aodh/tasks.yaml

@@ -51,7 +51,8 @@
   version: 2.1.0
   groups: [primary-controller]
   cross-depends:
-    - name: /(primary-)?database/
+    - name: primary-database
+    - name: database
       role: self
   required_for: [aodh]
   condition:

deployment/puppet/openstack_tasks/examples/glance/tasks.yaml

@@ -44,7 +44,8 @@
       changedAny($.glance, $.mysql, $.network_metadata.vips,
       $.get('database_vip'))
   cross-depends:
-    - name: /(primary-)?database/
+    - name: primary-database
+    - name: database
       role: self
   parameters:
     puppet_manifest: /etc/puppet/modules/openstack_tasks/examples/glance/db.pp

deployment/puppet/openstack_tasks/examples/heat/tasks.yaml

@@ -64,7 +64,8 @@
       $.network_metadata.get('vips',{}).get('management'),
       $.get('database_vip'), $.get('mysql_custom_setup_class'))
   cross-depends:
-    - name: /(primary-)?database/
+    - name: primary-database
+    - name: database
       role: self
   parameters:
     puppet_manifest: /etc/puppet/modules/openstack_tasks/examples/heat/db.pp

deployment/puppet/openstack_tasks/examples/ironic/tasks.yaml

@@ -30,7 +30,8 @@
   version: 2.1.0
   groups: [primary-controller]
   cross-depends:
-    - name: /(primary-)?database/
+    - name: primary-database
+    - name: database
       role: self
   condition:
     yaql_exp: >

deployment/puppet/openstack_tasks/examples/keystone/tasks.yaml

@@ -84,7 +84,8 @@
       changedAny($.network_metadata, $.keystone, $.mysql,
       $.get('database_vip'))
   cross-depends:
-    - name: /(primary-)?database/
+    - name: primary-database
+    - name: database
       role: self
   parameters:
     puppet_manifest: /etc/puppet/modules/openstack_tasks/examples/keystone/db.pp

deployment/puppet/openstack_tasks/examples/murano/tasks.yaml

@@ -35,7 +35,8 @@
   version: 2.1.0
   groups: [primary-controller]
   cross-depends:
-    - name: /(primary-)?database/
+    - name: primary-database
+    - name: database
       role: self
   condition:
     yaql_exp: >

deployment/puppet/openstack_tasks/examples/openstack-cinder/tasks.yaml

@@ -38,7 +38,8 @@
       changedAny($.cinder, $.mysql, $.network_metadata.vips,
       $.get('mysql_custom_setup_class'))
   cross-depends:
-    - name: /(primary-)?database/
+    - name: primary-database
+    - name: database
       role: self
   parameters:
     puppet_manifest: /etc/puppet/modules/openstack_tasks/examples/openstack-cinder/db.pp

deployment/puppet/openstack_tasks/examples/openstack-controller/tasks.yaml

@@ -62,7 +62,8 @@
       changedAny($.nova, $.mysql, $.network_metadata.vips,
       $.get('database_vip'))
   cross-depends:
-    - name: /(primary-)?database/
+    - name: primary-database
+    - name: database
       role: self
   parameters:
     puppet_manifest: /etc/puppet/modules/openstack_tasks/examples/openstack-controller/db.pp

deployment/puppet/openstack_tasks/examples/openstack-network/tasks.yaml

@@ -9,7 +9,8 @@
       changedAny($.quantum, $.quantum_settings, $.mysql,
       $.network_metadata.vips, $.get('database_vip'))
   cross-depends:
-    - name: /(primary-)?database/
+    - name: primary-database
+    - name: database
       role: self
   parameters:
     puppet_manifest: /etc/puppet/modules/openstack_tasks/examples/openstack-network/db.pp

deployment/puppet/openstack_tasks/examples/sahara/tasks.yaml

@@ -34,7 +34,8 @@
   version: 2.1.0
   groups: [primary-controller]
   cross-depends:
-    - name: /(primary-)?database/
+    - name: primary-database
+    - name: database
       role: self
   required_for: [sahara]
   condition: