Fix pep8 and remove non-working scp_opts

The scp_opts don't seem to be able to quiet the scp: error for the
certificate.

Author: ajkavanagh

zaza/openstack/charm_tests/ceph/tests.py

@@ -272,8 +272,7 @@ def test_ceph_encryption(self):
                 source = '/tmp/dmcrypt-keys/*'
                 zaza_model.scp_from_unit(unit_name=unit_name,
                                          source=source,
-                                         destination=tempdir,
-                                         scp_opts='-p')
+                                         destination=tempdir)
                 for elt in listdir(tempdir):
                     file_path = '/'.join([tempdir, elt])
                     if path.isfile(file_path):

zaza/openstack/charm_tests/manila/tests.py

@@ -353,7 +353,7 @@ def _restart_share_instance(self):
         return False
 
     def _wait_for_ceph_healthy(self):
-        """Wait until the ceph health is healthy"""
+        """Wait until the ceph health is healthy."""
         logging.info("Waiting for ceph to be healthy")
         for attempt in tenacity.Retrying(
             wait=tenacity.wait_fixed(5),
@@ -365,8 +365,7 @@ def _wait_for_ceph_healthy(self):
                 self.assertEqual(
                     zaza.model.run_on_leader(
                         "ceph-mon", "sudo ceph health")["Code"],
-                    "0"
-        )
+                    "0")
         logging.info("...Ceph is healthy")
 
     def test_manila_share(self):

zaza/openstack/utilities/openstack.py

@@ -2323,9 +2323,7 @@ def get_remote_ca_cert_file(application, model_name=None):
                 model.scp_from_unit(
                     unit,
                     cert_file,
-                    _tmp_ca.name,
-                    scp_opts='-q',
-                )
+                    _tmp_ca.name)
             except JujuError:
                 continue
             # ensure that the path to put the local cacert in actually exists.