Enable bionic/stein and disco/stein functional tests

Drop service check for ``glance-registry``.  The service is
removed as of Stein, and it really is not this charm functional
tests job of checking this anyway.  Any such detail should
be deferred to the ``charm-glance`` functional tests.

Change-Id: Icc2a73d6b8fc3f85a5ebc7fefa23c468cd173e40

tests/basic_deployment.py

@@ -253,8 +253,7 @@ class SwiftStorageBasicDeployment(OpenStackAmuletDeployment):
                                   'swift-object-updater']
         service_names = {
             self.keystone_sentry: ['keystone'],
-            self.glance_sentry: ['glance-registry',
-                                 'glance-api'],
+            self.glance_sentry: ['glance-api'],
             self.swift_proxy_sentry: ['swift-proxy'],
             self.swift_storage_sentry: swift_storage_services
         }

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 swift-storage deployment on disco-stein."""
+
+from basic_deployment import SwiftStorageBasicDeployment
+
+if __name__ == '__main__':
+    deployment = SwiftStorageBasicDeployment(series='disco')
+    deployment.run_tests()

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 swift-storage deployment on bionic-stein."""
+
+from basic_deployment import SwiftStorageBasicDeployment
+
+if __name__ == '__main__':
+    deployment = SwiftStorageBasicDeployment(series='bionic',
+                                        openstack='cloud:bionic-stein',
+                                        source='cloud:bionic-stein')
+    deployment.run_tests()