From 23e7fa0382c6c8c70d4a1114b2b6ad3bc82905b1 Mon Sep 17 00:00:00 2001
From: ZhongShengping <chdzsp@163.com>
Date: Mon, 12 Mar 2018 16:33:08 +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: If6394558b373f85e61840f538a3e2e1105cfe98c
Closes-Bug: #1755102
(cherry picked from commit 1f694ff1a42282b62c2330ea7f1e6b421ec43f51)
---
 manifests/db/sync.pp                                      | 1 +
 manifests/inspector/db/sync.pp                            | 1 +
 releasenotes/notes/openstack_db_tag-92785ba5669c7b28.yaml | 3 +++
 spec/classes/ironic_db_sync_spec.rb                       | 2 ++
 spec/classes/ironic_inspector_db_sync_spec.rb             | 3 ++-
 5 files changed, 9 insertions(+), 1 deletion(-)
 create mode 100644 releasenotes/notes/openstack_db_tag-92785ba5669c7b28.yaml

diff --git a/manifests/db/sync.pp b/manifests/db/sync.pp
index f4e3fa15..12ff218f 100644
--- a/manifests/db/sync.pp
+++ b/manifests/db/sync.pp
@@ -41,5 +41,6 @@ class ironic::db::sync(
     ],
     notify      => Anchor['ironic::dbsync::end'],
     require     => File['/var/log/ironic/ironic-dbsync.log'],
+    tag         => 'openstack-db',
   }
 }
diff --git a/manifests/inspector/db/sync.pp b/manifests/inspector/db/sync.pp
index 5ea6e528..c9d452a7 100644
--- a/manifests/inspector/db/sync.pp
+++ b/manifests/inspector/db/sync.pp
@@ -18,5 +18,6 @@ class ironic::inspector::db::sync {
       Anchor['ironic-inspector::dbsync::begin']
     ],
     notify      => Anchor['ironic-inspector::dbsync::end'],
+    tag         => 'openstack-db',
   }
 }
diff --git a/releasenotes/notes/openstack_db_tag-92785ba5669c7b28.yaml b/releasenotes/notes/openstack_db_tag-92785ba5669c7b28.yaml
new file mode 100644
index 00000000..4872e117
--- /dev/null
+++ b/releasenotes/notes/openstack_db_tag-92785ba5669c7b28.yaml
@@ -0,0 +1,3 @@
+---
+features:
+  - Add openstack-db tag to Exec that run db-sync.
diff --git a/spec/classes/ironic_db_sync_spec.rb b/spec/classes/ironic_db_sync_spec.rb
index 6f82a3a6..1d1f59f2 100644
--- a/spec/classes/ironic_db_sync_spec.rb
+++ b/spec/classes/ironic_db_sync_spec.rb
@@ -17,6 +17,7 @@ describe 'ironic::db::sync' do
                          'Anchor[ironic::config::end]',
                          'Anchor[ironic::dbsync::begin]'],
         :notify      => 'Anchor[ironic::dbsync::end]',
+        :tag         => 'openstack-db',
       )
 
       is_expected.to contain_file('/var/log/ironic/ironic-dbsync.log').with(
@@ -44,6 +45,7 @@ describe 'ironic::db::sync' do
                              'Anchor[ironic::config::end]',
                              'Anchor[ironic::dbsync::begin]'],
             :notify      => 'Anchor[ironic::dbsync::end]',
+            :tag         => 'openstack-db',
         )
         }
     end
diff --git a/spec/classes/ironic_inspector_db_sync_spec.rb b/spec/classes/ironic_inspector_db_sync_spec.rb
index b142e10b..fc9842d6 100644
--- a/spec/classes/ironic_inspector_db_sync_spec.rb
+++ b/spec/classes/ironic_inspector_db_sync_spec.rb
@@ -10,7 +10,8 @@ describe 'ironic::inspector::db::sync' do
         :path        => '/usr/bin',
         :user        => 'ironic-inspector',
         :refreshonly => 'true',
-        :logoutput   => 'on_failure'
+        :logoutput   => 'on_failure',
+        :tag         => 'openstack-db',
       )
     end