From aa6fb68a89722dbdd5364fd504a61125f7beb1ff Mon Sep 17 00:00:00 2001
From: ZhongShengping <chdzsp@163.com>
Date: Mon, 12 Mar 2018 16:33:09 +0800
Subject: [PATCH] Add 'openstack-db' tag to db-sync Exec resource

In order to make easy orchestration on all OpenStack db-sync, add this
tag so people can use this tag in composition layer.
A use case it to set some orchestration to make sure MySQL Galera is
ready before running any Exec with this tag.

Change-Id: I2df5ae03c13b7bde00621a8b208e7204b4747713
Closes-Bug: #1755102
(cherry picked from commit 45b3c8cfa1f8ed4ab80204d9c0e3fb9af95fb306)
---
 manifests/db/sync.pp                                      | 1 +
 manifests/db/sync_api.pp                                  | 1 +
 releasenotes/notes/openstack_db_tag-b26aeeb1ec92e5a0.yaml | 3 +++
 spec/classes/nova_db_sync_api_spec.rb                     | 3 +++
 spec/classes/nova_db_sync_spec.rb                         | 3 +++
 5 files changed, 11 insertions(+)
 create mode 100644 releasenotes/notes/openstack_db_tag-b26aeeb1ec92e5a0.yaml

diff --git a/manifests/db/sync.pp b/manifests/db/sync.pp
index 94a336fb2..d3e45b740 100644
--- a/manifests/db/sync.pp
+++ b/manifests/db/sync.pp
@@ -36,5 +36,6 @@ class nova::db::sync(
       Anchor['nova::dbsync::begin']
     ],
     notify      => Anchor['nova::dbsync::end'],
+    tag         => 'openstack-db',
   }
 }
diff --git a/manifests/db/sync_api.pp b/manifests/db/sync_api.pp
index b26bfa3ed..9667ee558 100644
--- a/manifests/db/sync_api.pp
+++ b/manifests/db/sync_api.pp
@@ -45,6 +45,7 @@ class nova::db::sync_api(
       Anchor['nova::dbsync_api::begin']
     ],
     notify      => Anchor['nova::dbsync_api::end'],
+    tag         => 'openstack-db',
   }
 
   if $cellv2_setup {
diff --git a/releasenotes/notes/openstack_db_tag-b26aeeb1ec92e5a0.yaml b/releasenotes/notes/openstack_db_tag-b26aeeb1ec92e5a0.yaml
new file mode 100644
index 000000000..4872e117d
--- /dev/null
+++ b/releasenotes/notes/openstack_db_tag-b26aeeb1ec92e5a0.yaml
@@ -0,0 +1,3 @@
+---
+features:
+  - Add openstack-db tag to Exec that run db-sync.
diff --git a/spec/classes/nova_db_sync_api_spec.rb b/spec/classes/nova_db_sync_api_spec.rb
index fc2a412b1..6745e2a02 100644
--- a/spec/classes/nova_db_sync_api_spec.rb
+++ b/spec/classes/nova_db_sync_api_spec.rb
@@ -16,6 +16,7 @@ describe 'nova::db::sync_api' do
                            'Anchor[nova::db::end]',
                            'Anchor[nova::dbsync_api::begin]'],
           :notify      => 'Anchor[nova::dbsync_api::end]',
+          :tag         => 'openstack-db',
         )
       }
       it { is_expected.to_not contain_class('nova::cell_v2::simple_setup') }
@@ -41,6 +42,7 @@ describe 'nova::db::sync_api' do
                            'Anchor[nova::db::end]',
                            'Anchor[nova::dbsync_api::begin]'],
           :notify      => 'Anchor[nova::dbsync_api::end]',
+          :tag         => 'openstack-db',
         )
       }
       it { is_expected.to_not contain_class('nova::cell_v2::simple_setup') }
@@ -65,6 +67,7 @@ describe 'nova::db::sync_api' do
                            'Anchor[nova::db::end]',
                            'Anchor[nova::dbsync_api::begin]'],
           :notify      => 'Anchor[nova::dbsync_api::end]',
+          :tag         => 'openstack-db',
         )
       }
     end
diff --git a/spec/classes/nova_db_sync_spec.rb b/spec/classes/nova_db_sync_spec.rb
index e6fb133cc..6a16ff09f 100644
--- a/spec/classes/nova_db_sync_spec.rb
+++ b/spec/classes/nova_db_sync_spec.rb
@@ -18,6 +18,7 @@ describe 'nova::db::sync' do
                          'Anchor[nova::db::end]',
                          'Anchor[nova::dbsync::begin]'],
         :notify      => 'Anchor[nova::dbsync::end]',
+        :tag         => 'openstack-db',
       )
     end
 
@@ -42,6 +43,7 @@ describe 'nova::db::sync' do
                            'Anchor[nova::db::end]',
                            'Anchor[nova::dbsync::begin]'],
           :notify      => 'Anchor[nova::dbsync::end]',
+          :tag         => 'openstack-db',
         )
         }
       end
@@ -67,6 +69,7 @@ describe 'nova::db::sync' do
                            'Anchor[nova::db::end]',
                            'Anchor[nova::dbsync::begin]'],
           :notify      => 'Anchor[nova::dbsync::end]',
+          :tag         => 'openstack-db',
         )
         }
       end