Merge "Only check for upgrades if bootstrapped"

hooks/ceph_hooks.py

@@ -82,6 +82,10 @@ STORAGE_MOUNT_PATH = '/var/lib/ceph'
 
 
 def check_for_upgrade():
+    if not ceph.is_bootstrapped():
+        log("Ceph is not bootstrapped, skipping upgrade checks.")
+        return
+
     release_info = host.lsb_release()
     if not release_info['DISTRIB_CODENAME'] == 'trusty':
         log("Invalid upgrade path from {}.  Only trusty is currently "

unit_tests/test_upgrade.py

@@ -17,12 +17,15 @@ def config_side_effect(*args):
 
 
 class UpgradeRollingTestCase(unittest.TestCase):
+
+    @patch('ceph_hooks.ceph.is_bootstrapped')
     @patch('ceph_hooks.ceph.resolve_ceph_version')
     @patch('ceph_hooks.hookenv')
     @patch('ceph_hooks.host')
     @patch('ceph_hooks.ceph.roll_osd_cluster')
     def test_check_for_upgrade(self, roll_osd_cluster, host, hookenv,
-                               version):
+                               version, is_bootstrapped):
+        is_bootstrapped.return_value = True
         version.side_effect = ['firefly', 'hammer']
         host.lsb_release.return_value = {
             'DISTRIB_CODENAME': 'trusty',
@@ -36,3 +39,24 @@ class UpgradeRollingTestCase(unittest.TestCase):
         roll_osd_cluster.assert_called_with(
             new_version='hammer',
             upgrade_key='osd-upgrade')
+
+    @patch('ceph_hooks.ceph.is_bootstrapped')
+    @patch('ceph_hooks.ceph.resolve_ceph_version')
+    @patch('ceph_hooks.hookenv')
+    @patch('ceph_hooks.host')
+    @patch('ceph_hooks.ceph.roll_monitor_cluster')
+    def test_check_for_upgrade_not_bootstrapped(self, roll_monitor_cluster,
+                                                host, hookenv,
+                                                version, is_bootstrapped):
+        is_bootstrapped.return_value = False
+        version.side_effect = ['firefly', 'hammer']
+        host.lsb_release.return_value = {
+            'DISTRIB_CODENAME': 'trusty',
+        }
+        previous_mock = MagicMock().return_value
+        previous_mock.previous.return_value = "cloud:trusty-juno"
+        hookenv.config.side_effect = [previous_mock,
+                                      config_side_effect('source')]
+        check_for_upgrade()
+
+        roll_monitor_cluster.assert_not_called()