Enable Ocata Amulet Tests

- Add Zesty as a supported series to metadata.yaml.
- Turn on Xenial-Ocata Amulet test definitions.
- Sync charm helpers to get Juju 2.x amulet compatibility.
- Keeping Zesty-Ocata Amulet test definitions turned off until the
  metadata.yaml changes propagate to the charm store.
- Sync tox.ini to resolve amulet test failures.
- Drop direct install of python-ldap and let python-ldappool pull
  in the right dependency, resolving Ocata install issues.

Change-Id: I25f3e904a4727af4efb80c36c45e4c0a21f26ec0

src/lib/charm/openstack/keystone_ldap.py

@@ -53,7 +53,7 @@ class KeystoneLDAPCharm(charms_openstack.charm.OpenStackCharm):
     release = 'mitaka'
 
     # List of packages to install for this charm
-    packages = ['python-ldap', 'python-ldappool']
+    packages = ['python-ldappool']
 
     configuration_class = KeystoneLDAPConfigurationAdapter
 

src/metadata.yaml

@@ -15,6 +15,7 @@ tags:
   - identity
 series:
   - xenial
+  - zesty
   - trusty
   - yakkety
 provides:

src/tests/basic_deployment.py

@@ -50,10 +50,13 @@ class KeystoneLDAPCharmDeployment(amulet_deployment.OpenStackAmuletDeployment):
         this_service = {'name': 'keystone-ldap'}
         other_services = [
             {'name': 'keystone'},
-            {'name': 'percona-cluster', 'constraints': {'mem': '3072M'}},
+            {'name': 'percona-cluster'},
         ]
-        super(KeystoneLDAPCharmDeployment, self)._add_services(this_service,
-                                                               other_services)
+        super(KeystoneLDAPCharmDeployment, self)._add_services(
+            this_service,
+            other_services,
+            no_origin=['keystone-ldap']
+        )
 
     def _add_relations(self):
         """Add all of the relations for the services."""
@@ -72,10 +75,7 @@ class KeystoneLDAPCharmDeployment(amulet_deployment.OpenStackAmuletDeployment):
         }
         keystone_ldap_config = self._get_ldap_config()
         pxc_config = {
-            'dataset-size': '25%',
             'max-connections': 1000,
-            'root-password': 'ChangeMe123',
-            'sst-password': 'ChangeMe123',
         }
         configs = {'keystone': keystone_config,
                    'keystone-ldap': keystone_ldap_config,

src/tests/gate-basic-zesty-ocata

@@ -0,0 +1,23 @@
+#!/usr/bin/env python
+#
+# Copyright 2017 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 Keystone LDAP Charm deployment on zesty-ocata."""
+
+from basic_deployment import KeystoneLDAPCharmDeployment
+
+if __name__ == '__main__':
+    deployment = KeystoneLDAPCharmDeployment(series='zesty')
+    deployment.run_tests()

src/tox.ini

@@ -10,7 +10,7 @@ setenv = VIRTUAL_ENV={envdir}
          PYTHONHASHSEED=0
          AMULET_SETUP_TIMEOUT=2700
 whitelist_externals = juju
-passenv = HOME TERM AMULET_*
+passenv = HOME TERM AMULET_* CS_API_URL
 deps = -r{toxinidir}/test-requirements.txt
 install_command =
   pip install --allow-unverified python-apt {opts} {packages}