Enable bionic/stein and disco/stein functional tests

Stein ceph packages no longer provide python-ceph; its not directly
used by the charm and the ceph-* packages have an appropriate
dependency on the underlying python{3}-ceph package for each
release of OpenStack and Ceph.

Closes-Bug: 1824154
Change-Id: Ibcec0142dbcff5509c7545f1bcc2d7d832b6d697

src/reactive/ceph_fs.py

@@ -16,6 +16,8 @@ import os
 import socket
 import subprocess
 
+import dns.resolver
+
 from charms import reactive
 from charms.reactive import when, when_not, hook
 from charms.reactive.flags import set_flag, clear_flag, is_flag_set
@@ -34,19 +36,13 @@ from charmhelpers.contrib.network.ip import (
 
 from charmhelpers.fetch import (
     get_upstream_version,
-    apt_install, filter_installed_packages)
+)
 import jinja2
 
 from charms.apt import queue_install, add_source
 
-PACKAGES = ['ceph', 'gdisk', 'ntp', 'btrfs-tools', 'python-ceph', 'xfsprogs']
+PACKAGES = ['ceph', 'gdisk', 'ntp', 'btrfs-tools', 'xfsprogs']
 
-try:
-    import dns.resolver
-except ImportError:
-    apt_install(filter_installed_packages(['python-dnspython']),
-                fatal=True)
-    import dns.resolver
 TEMPLATES_DIR = 'templates'
 VERSION_PACKAGE = 'ceph-common'
 

src/tests/dev-basic-disco-stein

@@ -0,0 +1,23 @@
+#!/usr/bin/env python
+#
+# Copyright 2016 Canonical Ltd
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+"""Amulet tests on a basic ceph deployment on disco-stein."""
+
+from basic_deployment import CephFsBasicDeployment
+
+if __name__ == '__main__':
+    deployment = CephFsBasicDeployment(series='disco')
+    deployment.run_tests()

src/tests/gate-basic-bionic-stein

@@ -0,0 +1,25 @@
+#!/usr/bin/env python
+#
+# Copyright 2016 Canonical Ltd
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+"""Amulet tests on a basic ceph deployment on bionic-stein."""
+
+from basic_deployment import CephFsBasicDeployment
+
+if __name__ == '__main__':
+    deployment = CephFsBasicDeployment(series='bionic',
+                                       openstack='cloud:bionic-stein',
+                                       source='cloud:bionic-stein')
+    deployment.run_tests()