upgrade pipelines fix
Change-Id: Ia078b0ce5f3d1192eb16849cae42d1ce70a8a386
diff --git a/openstack-control-upgrade.groovy b/openstack-control-upgrade.groovy
index 8e841b9..bff17f1 100644
--- a/openstack-control-upgrade.groovy
+++ b/openstack-control-upgrade.groovy
@@ -417,6 +417,24 @@
common.errorMsg("Stage Real control upgrade failed")
}
if(!errorOccured){
+
+ ceph = null
+
+ try {
+ ceph = salt.cmdRun(saltMaster, 'ctl*', "salt-call grains.item roles | grep ceph.client")
+
+ } catch (Exception er) {
+ common.infoMsg("Ceph is not used")
+ }
+
+ if(ceph != null) {
+ try {
+ salt.enforceState(saltMaster, 'ctl*', 'ceph.client')
+ } catch (Exception er) {
+ common.warningMsg("Ceph client state on controllers failed. Please fix it manually")
+ }
+ }
+
// salt 'cmp*' cmd.run 'service nova-compute restart'
salt.runSaltProcessStep(saltMaster, 'cmp*', 'service.restart', ['nova-compute'], null, true)