diff --git a/hooks/charmhelpers/contrib/openstack/amulet/deployment.py b/hooks/charmhelpers/contrib/openstack/amulet/deployment.py index 6fe8cf8..9e0b07f 100644 --- a/hooks/charmhelpers/contrib/openstack/amulet/deployment.py +++ b/hooks/charmhelpers/contrib/openstack/amulet/deployment.py @@ -156,7 +156,7 @@ class OpenStackAmuletDeployment(AmuletDeployment): use_source = list(set( use_source + ['mysql', 'mongodb', 'rabbitmq-server', 'ceph', 'ceph-osd', 'ceph-radosgw', 'ceph-mon', - 'ceph-proxy'])) + 'ceph-proxy', 'percona-cluster', 'lxd'])) # Charms which can not use openstack-origin, ie. many subordinates no_origin = list(set( diff --git a/hooks/charmhelpers/contrib/openstack/amulet/utils.py b/hooks/charmhelpers/contrib/openstack/amulet/utils.py index 24b353e..e4546c8 100644 --- a/hooks/charmhelpers/contrib/openstack/amulet/utils.py +++ b/hooks/charmhelpers/contrib/openstack/amulet/utils.py @@ -306,10 +306,8 @@ class OpenStackAmuletUtils(AmuletUtils): password, tenant): """Authenticates admin user with cinder.""" # NOTE(beisner): cinder python client doesn't accept tokens. - service_ip = \ - keystone_sentry.relation('shared-db', - 'mysql:shared-db')['private-address'] - ept = "http://{}:5000/v2.0".format(service_ip.strip().decode('utf-8')) + keystone_ip = keystone_sentry.info['public-address'] + ept = "http://{}:5000/v2.0".format(keystone_ip.strip().decode('utf-8')) return cinder_client.Client(username, password, tenant, ept) def authenticate_keystone_admin(self, keystone_sentry, user, password, @@ -317,10 +315,9 @@ class OpenStackAmuletUtils(AmuletUtils): keystone_ip=None): """Authenticates admin user with the keystone admin endpoint.""" self.log.debug('Authenticating keystone admin...') - unit = keystone_sentry if not keystone_ip: - keystone_ip = unit.relation('shared-db', - 'mysql:shared-db')['private-address'] + keystone_ip = keystone_sentry.info['public-address'] + base_ep = "http://{}:35357".format(keystone_ip.strip().decode('utf-8')) if not api_version or api_version == 2: ep = base_ep + "/v2.0" diff --git a/hooks/charmhelpers/contrib/openstack/utils.py b/hooks/charmhelpers/contrib/openstack/utils.py index 9abd4c3..8c89c3a 100644 --- a/hooks/charmhelpers/contrib/openstack/utils.py +++ b/hooks/charmhelpers/contrib/openstack/utils.py @@ -229,6 +229,7 @@ GIT_DEFAULT_REPOS = { GIT_DEFAULT_BRANCHES = { 'liberty': 'stable/liberty', 'mitaka': 'stable/mitaka', + 'newton': 'stable/newton', 'master': 'master', } @@ -735,12 +736,12 @@ def git_os_codename_install_source(projects_yaml): if projects in GIT_DEFAULT_BRANCHES.keys(): if projects == 'master': - return 'newton' + return 'ocata' return projects if 'release' in projects: if projects['release'] == 'master': - return 'newton' + return 'ocata' return projects['release'] return None diff --git a/tests/basic_deployment.py b/tests/basic_deployment.py index fc0d8c9..3c9418b 100644 --- a/tests/basic_deployment.py +++ b/tests/basic_deployment.py @@ -56,9 +56,10 @@ class HeatBasicDeployment(OpenStackAmuletDeployment): self._deploy() u.log.info('Waiting on extended status checks...') - exclude_services = ['mysql'] + exclude_services = [] self._auto_wait_for_status(exclude_services=exclude_services) + self.d.sentry.wait() self._initialize_tests() def _add_services(self): @@ -69,12 +70,14 @@ class HeatBasicDeployment(OpenStackAmuletDeployment): compatible with the local charm (e.g. stable or next). """ this_service = {'name': 'heat', 'constraints': {'mem': '2G'}} - other_services = [{'name': 'keystone'}, - {'name': 'rabbitmq-server'}, - {'name': 'mysql'}, - {'name': 'glance'}, - {'name': 'nova-cloud-controller'}, - {'name': 'nova-compute'}] + other_services = [ + {'name': 'keystone'}, + {'name': 'rabbitmq-server'}, + {'name': 'percona-cluster', 'constraints': {'mem': '3072M'}}, + {'name': 'glance'}, + {'name': 'nova-cloud-controller'}, + {'name': 'nova-compute'} + ] super(HeatBasicDeployment, self)._add_services(this_service, other_services) @@ -84,20 +87,20 @@ class HeatBasicDeployment(OpenStackAmuletDeployment): relations = { 'heat:amqp': 'rabbitmq-server:amqp', 'heat:identity-service': 'keystone:identity-service', - 'heat:shared-db': 'mysql:shared-db', + 'heat:shared-db': 'percona-cluster:shared-db', 'nova-compute:image-service': 'glance:image-service', - 'nova-compute:shared-db': 'mysql:shared-db', + 'nova-compute:shared-db': 'percona-cluster:shared-db', 'nova-compute:amqp': 'rabbitmq-server:amqp', - 'nova-cloud-controller:shared-db': 'mysql:shared-db', + 'nova-cloud-controller:shared-db': 'percona-cluster:shared-db', 'nova-cloud-controller:identity-service': 'keystone:identity-service', 'nova-cloud-controller:amqp': 'rabbitmq-server:amqp', 'nova-cloud-controller:cloud-compute': 'nova-compute:cloud-compute', 'nova-cloud-controller:image-service': 'glance:image-service', - 'keystone:shared-db': 'mysql:shared-db', + 'keystone:shared-db': 'percona-cluster:shared-db', 'glance:identity-service': 'keystone:identity-service', - 'glance:shared-db': 'mysql:shared-db', + 'glance:shared-db': 'percona-cluster:shared-db', 'glance:amqp': 'rabbitmq-server:amqp' } super(HeatBasicDeployment, self)._add_relations(relations) @@ -108,14 +111,25 @@ class HeatBasicDeployment(OpenStackAmuletDeployment): 'enable-live-migration': 'False'} keystone_config = {'admin-password': 'openstack', 'admin-token': 'ubuntutesting'} - configs = {'nova-compute': nova_config, 'keystone': keystone_config} + pxc_config = { + 'dataset-size': '25%', + 'max-connections': 1000, + 'root-password': 'ChangeMe123', + 'sst-password': 'ChangeMe123', + } + + configs = { + 'nova-compute': nova_config, + 'keystone': keystone_config, + 'percona-cluster': pxc_config, + } super(HeatBasicDeployment, self)._configure_services(configs) def _initialize_tests(self): """Perform final initialization before tests get run.""" # Access the sentries for inspecting service units self.heat_sentry = self.d.sentry['heat'][0] - self.mysql_sentry = self.d.sentry['mysql'][0] + self.pxc_sentry = self.d.sentry['percona-cluster'][0] self.keystone_sentry = self.d.sentry['keystone'][0] self.rabbitmq_sentry = self.d.sentry['rabbitmq-server'][0] self.nova_compute_sentry = self.d.sentry['nova-compute'][0] @@ -342,7 +356,7 @@ class HeatBasicDeployment(OpenStackAmuletDeployment): """Verify the heat:mysql shared-db relation data""" u.log.debug('Checking heat:mysql shared-db relation data...') unit = self.heat_sentry - relation = ['shared-db', 'mysql:shared-db'] + relation = ['shared-db', 'percona-cluster:shared-db'] expected = { 'private-address': u.valid_ip, 'heat_database': 'heat', @@ -358,7 +372,7 @@ class HeatBasicDeployment(OpenStackAmuletDeployment): def test_201_mysql_heat_shared_db_relation(self): """Verify the mysql:heat shared-db relation data""" u.log.debug('Checking mysql:heat shared-db relation data...') - unit = self.mysql_sentry + unit = self.pxc_sentry relation = ['shared-db', 'heat:shared-db'] expected = { 'private-address': u.valid_ip, @@ -372,7 +386,7 @@ class HeatBasicDeployment(OpenStackAmuletDeployment): ret = u.validate_relation_data(unit, relation, expected) if ret: - message = u.relation_error('mysql:heat shared-db', ret) + message = u.relation_error('percona-cluster:heat shared-db', ret) amulet.raise_status(amulet.FAIL, msg=message) def test_202_heat_keystone_identity_relation(self): @@ -463,12 +477,12 @@ class HeatBasicDeployment(OpenStackAmuletDeployment): 'heat:identity-service') rmq_rel = self.rabbitmq_sentry.relation('amqp', 'heat:amqp') - mysql_rel = self.mysql_sentry.relation('shared-db', - 'heat:shared-db') + mysql_rel = self.pxc_sentry.relation('shared-db', + 'heat:shared-db') u.log.debug('keystone:heat relation: {}'.format(ks_rel)) u.log.debug('rabbitmq:heat relation: {}'.format(rmq_rel)) - u.log.debug('mysql:heat relation: {}'.format(mysql_rel)) + u.log.debug('percona-cluster:heat relation: {}'.format(mysql_rel)) db_uri = "mysql://{}:{}@{}/{}".format('heat', mysql_rel['heat_password'], diff --git a/tests/charmhelpers/contrib/openstack/amulet/deployment.py b/tests/charmhelpers/contrib/openstack/amulet/deployment.py index 6fe8cf8..9e0b07f 100644 --- a/tests/charmhelpers/contrib/openstack/amulet/deployment.py +++ b/tests/charmhelpers/contrib/openstack/amulet/deployment.py @@ -156,7 +156,7 @@ class OpenStackAmuletDeployment(AmuletDeployment): use_source = list(set( use_source + ['mysql', 'mongodb', 'rabbitmq-server', 'ceph', 'ceph-osd', 'ceph-radosgw', 'ceph-mon', - 'ceph-proxy'])) + 'ceph-proxy', 'percona-cluster', 'lxd'])) # Charms which can not use openstack-origin, ie. many subordinates no_origin = list(set( diff --git a/tests/charmhelpers/contrib/openstack/amulet/utils.py b/tests/charmhelpers/contrib/openstack/amulet/utils.py index 24b353e..e4546c8 100644 --- a/tests/charmhelpers/contrib/openstack/amulet/utils.py +++ b/tests/charmhelpers/contrib/openstack/amulet/utils.py @@ -306,10 +306,8 @@ class OpenStackAmuletUtils(AmuletUtils): password, tenant): """Authenticates admin user with cinder.""" # NOTE(beisner): cinder python client doesn't accept tokens. - service_ip = \ - keystone_sentry.relation('shared-db', - 'mysql:shared-db')['private-address'] - ept = "http://{}:5000/v2.0".format(service_ip.strip().decode('utf-8')) + keystone_ip = keystone_sentry.info['public-address'] + ept = "http://{}:5000/v2.0".format(keystone_ip.strip().decode('utf-8')) return cinder_client.Client(username, password, tenant, ept) def authenticate_keystone_admin(self, keystone_sentry, user, password, @@ -317,10 +315,9 @@ class OpenStackAmuletUtils(AmuletUtils): keystone_ip=None): """Authenticates admin user with the keystone admin endpoint.""" self.log.debug('Authenticating keystone admin...') - unit = keystone_sentry if not keystone_ip: - keystone_ip = unit.relation('shared-db', - 'mysql:shared-db')['private-address'] + keystone_ip = keystone_sentry.info['public-address'] + base_ep = "http://{}:35357".format(keystone_ip.strip().decode('utf-8')) if not api_version or api_version == 2: ep = base_ep + "/v2.0" diff --git a/tests/gate-basic-precise-icehouse b/tests/gate-basic-precise-icehouse deleted file mode 100755 index 65bb0ee..0000000 --- a/tests/gate-basic-precise-icehouse +++ /dev/null @@ -1,25 +0,0 @@ -#!/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 heat deployment on precise-icehouse.""" - -from basic_deployment import HeatBasicDeployment - -if __name__ == '__main__': - deployment = HeatBasicDeployment(series='precise', - openstack='cloud:precise-icehouse', - source='cloud:precise-updates/icehouse') - deployment.run_tests() diff --git a/tests/dev-basic-xenial-newton b/tests/gate-basic-xenial-newton similarity index 100% rename from tests/dev-basic-xenial-newton rename to tests/gate-basic-xenial-newton diff --git a/tests/dev-basic-yakkety-newton b/tests/gate-basic-yakkety-newton old mode 100755 new mode 100644 similarity index 100% rename from tests/dev-basic-yakkety-newton rename to tests/gate-basic-yakkety-newton diff --git a/tests/tests.yaml b/tests/tests.yaml index e3185c6..e27d100 100644 --- a/tests/tests.yaml +++ b/tests/tests.yaml @@ -1,7 +1,7 @@ # Bootstrap the model if necessary. bootstrap: True -# Re-use bootstrap node instead of destroying/re-bootstrapping. -reset: True +# No reset https://bugs.launchpad.net/juju/+bug/1541482 +reset: False # Use tox/requirements to drive the venv instead of bundletester's venv feature. virtualenv: False # Leave makefile empty, otherwise unit/lint tests will rerun ahead of amulet.