diff --git a/charmhelpers/contrib/openstack/amulet/deployment.py b/charmhelpers/contrib/openstack/amulet/deployment.py index 6fe8cf88..9e0b07fb 100644 --- a/charmhelpers/contrib/openstack/amulet/deployment.py +++ b/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/charmhelpers/contrib/openstack/amulet/utils.py b/charmhelpers/contrib/openstack/amulet/utils.py index 24b353ee..e4546c8c 100644 --- a/charmhelpers/contrib/openstack/amulet/utils.py +++ b/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/charmhelpers/contrib/openstack/utils.py b/charmhelpers/contrib/openstack/utils.py index 9abd4c31..8c89c3a3 100644 --- a/charmhelpers/contrib/openstack/utils.py +++ b/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/config.yaml b/config.yaml index bf2c8684..b6999a11 100644 --- a/config.yaml +++ b/config.yaml @@ -48,6 +48,7 @@ options: the corresponding OpenStack github branch will be used: * liberty * mitaka + * newton * master The YAML must minimally include requirements and glance repositories, diff --git a/tests/basic_deployment.py b/tests/basic_deployment.py index c74497f3..b3196af2 100644 --- a/tests/basic_deployment.py +++ b/tests/basic_deployment.py @@ -55,9 +55,10 @@ class GlanceBasicDeployment(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 _assert_services(self, should_run): @@ -73,17 +74,19 @@ class GlanceBasicDeployment(OpenStackAmuletDeployment): compatible with the local charm (e.g. stable or next). """ this_service = {'name': 'glance'} - other_services = [{'name': 'mysql'}, - {'name': 'rabbitmq-server'}, - {'name': 'keystone'}] + other_services = [ + {'name': 'percona-cluster', 'constraints': {'mem': '3072M'}}, + {'name': 'rabbitmq-server'}, + {'name': 'keystone'}, + ] super(GlanceBasicDeployment, self)._add_services(this_service, other_services) def _add_relations(self): """Add relations for the services.""" relations = {'glance:identity-service': 'keystone:identity-service', - 'glance:shared-db': 'mysql:shared-db', - 'keystone:shared-db': 'mysql:shared-db', + 'glance:shared-db': 'percona-cluster:shared-db', + 'keystone:shared-db': 'percona-cluster:shared-db', 'glance:amqp': 'rabbitmq-server:amqp'} super(GlanceBasicDeployment, self)._add_relations(relations) @@ -117,18 +120,27 @@ class GlanceBasicDeployment(OpenStackAmuletDeployment): glance_config['openstack-origin-git'] = \ yaml.dump(openstack_origin_git) - keystone_config = {'admin-password': 'openstack', - 'admin-token': 'ubuntutesting'} - mysql_config = {'dataset-size': '50%'} - configs = {'glance': glance_config, - 'keystone': keystone_config, - 'mysql': mysql_config} + keystone_config = { + 'admin-password': 'openstack', + 'admin-token': 'ubuntutesting', + } + pxc_config = { + 'dataset-size': '25%', + 'max-connections': 1000, + 'root-password': 'ChangeMe123', + 'sst-password': 'ChangeMe123', + } + configs = { + 'glance': glance_config, + 'keystone': keystone_config, + 'percona-cluster': pxc_config, + } super(GlanceBasicDeployment, self)._configure_services(configs) def _initialize_tests(self): """Perform final initialization before tests get run.""" # Access the sentries for inspecting service units - self.mysql_sentry = self.d.sentry['mysql'][0] + self.pxc_sentry = self.d.sentry['percona-cluster'][0] self.glance_sentry = self.d.sentry['glance'][0] self.keystone_sentry = self.d.sentry['keystone'][0] self.rabbitmq_sentry = self.d.sentry['rabbitmq-server'][0] @@ -142,7 +154,6 @@ class GlanceBasicDeployment(OpenStackAmuletDeployment): user='admin', password='openstack', tenant='admin') - # Authenticate admin with glance endpoint self.glance = u.authenticate_glance_admin(self.keystone) @@ -150,7 +161,6 @@ class GlanceBasicDeployment(OpenStackAmuletDeployment): """Verify that the expected services are running on the corresponding service units.""" services = { - self.mysql_sentry: ['mysql'], self.keystone_sentry: ['keystone'], self.glance_sentry: ['glance-api', 'glance-registry'], self.rabbitmq_sentry: ['rabbitmq-server'] @@ -244,7 +254,7 @@ class GlanceBasicDeployment(OpenStackAmuletDeployment): def test_200_mysql_glance_db_relation(self): """Verify the mysql:glance shared-db relation data""" u.log.debug('Checking mysql to glance shared-db relation data...') - unit = self.mysql_sentry + unit = self.pxc_sentry relation = ['shared-db', 'glance:shared-db'] expected = { 'private-address': u.valid_ip, @@ -259,7 +269,7 @@ class GlanceBasicDeployment(OpenStackAmuletDeployment): """Verify the glance:mysql shared-db relation data""" u.log.debug('Checking glance to mysql shared-db relation data...') unit = self.glance_sentry - relation = ['shared-db', 'mysql:shared-db'] + relation = ['shared-db', 'percona-cluster:shared-db'] expected = { 'private-address': u.valid_ip, 'hostname': u.valid_ip, @@ -415,7 +425,7 @@ class GlanceBasicDeployment(OpenStackAmuletDeployment): rel_mq_gl = self.rabbitmq_sentry.relation('amqp', 'glance:amqp') rel_ks_gl = unit_ks.relation('identity-service', 'glance:identity-service') - rel_my_gl = self.mysql_sentry.relation('shared-db', 'glance:shared-db') + rel_my_gl = self.pxc_sentry.relation('shared-db', 'glance:shared-db') db_uri = "mysql://{}:{}@{}/{}".format('glance', rel_my_gl['password'], rel_my_gl['db_host'], 'glance') conf = '/etc/glance/glance-api.conf' @@ -488,7 +498,7 @@ class GlanceBasicDeployment(OpenStackAmuletDeployment): unit_ks = self.keystone_sentry rel_ks_gl = unit_ks.relation('identity-service', 'glance:identity-service') - rel_my_gl = self.mysql_sentry.relation('shared-db', 'glance:shared-db') + rel_my_gl = self.pxc_sentry.relation('shared-db', 'glance:shared-db') db_uri = "mysql://{}:{}@{}/{}".format('glance', rel_my_gl['password'], rel_my_gl['db_host'], 'glance') conf = '/etc/glance/glance-registry.conf' diff --git a/tests/charmhelpers/contrib/openstack/amulet/deployment.py b/tests/charmhelpers/contrib/openstack/amulet/deployment.py index 6fe8cf88..9e0b07fb 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 24b353ee..e4546c8c 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 147625bc..00000000 --- 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 glance deployment on precise-icehouse.""" - -from basic_deployment import GlanceBasicDeployment - -if __name__ == '__main__': - deployment = GlanceBasicDeployment(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 e3185c6d..4cf93d01 100644 --- a/tests/tests.yaml +++ b/tests/tests.yaml @@ -1,6 +1,6 @@ # Bootstrap the model if necessary. bootstrap: True -# Re-use bootstrap node instead of destroying/re-bootstrapping. +# Re-use bootstrap node. reset: True # Use tox/requirements to drive the venv instead of bundletester's venv feature. virtualenv: False