openstack/puppet-openstack-integration
Code Issues Proposed changes

Remove testing for Glance Registry

Browse Source 
Glance registry is not required for the v2 of the API and there are
plans to deprecate it in the glance community. Allow for it to be
disabled in tests.

Change-Id: I89f319f18f4cbda4244e96732a16df81a0f836b0
This commit is contained in:
Emilien Macchi 2016-12-13 18:05:07 -05:00
parent dbc4ab06f9
commit 817f19550a
3 changed files with 11 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
manifests/glance.pp
View File

@ -14,13 +14,12 @@ class openstack_integration::glance (
if $::openstack_integration::config::ssl {
openstack_integration::ssl_key { 'glance':
notify => [Service['glance-api'], Service['glance-registry']],
notify => Service['glance-api'],
}
Package<| tag == 'glance-package' |> -> File['/etc/glance/ssl']
$key_file = "/etc/glance/ssl/private/${::fqdn}.pem"
$crt_file = $::openstack_integration::params::cert_path
Exec['update-ca-certificates'] ~> Service['glance-api']
Exec['update-ca-certificates'] ~> Service['glance-registry']
} else {
$key_file = undef
$crt_file = undef
@ -59,14 +58,6 @@ class openstack_integration::glance (
auth_uri => $::openstack_integration::config::keystone_auth_uri,
memcached_servers => $::openstack_integration::config::memcached_servers,
}
class { '::glance::registry::authtoken':
password => 'a_big_secret',
user_domain_name => 'Default',
project_domain_name => 'Default',
auth_url => $::openstack_integration::config::keystone_admin_uri,
auth_uri => $::openstack_integration::config::keystone_auth_uri,
memcached_servers => $::openstack_integration::config::memcached_servers,
}
case $backend {
'file': {
include ::glance::backend::file
@ -98,26 +89,16 @@ class openstack_integration::glance (
$http_store = ['http']
$glance_stores = concat($http_store, $backend_store)
class { '::glance::api':
debug => true,
database_connection => 'mysql+pymysql://glance:glance@127.0.0.1/glance?charset=utf8',
workers => 2,
stores => $glance_stores,
default_store => $backend,
bind_host => $::openstack_integration::config::host,
registry_client_protocol => $::openstack_integration::config::proto,
registry_client_cert_file => $crt_file,
registry_client_key_file => $key_file,
registry_host => $::openstack_integration::config::host,
cert_file => $crt_file,
key_file => $key_file,
}
class { '::glance::registry':
debug => true,
database_connection => 'mysql+pymysql://glance:glance@127.0.0.1/glance?charset=utf8',
bind_host => $::openstack_integration::config::host,
workers => 2,
stores => $glance_stores,
default_store => $backend,
bind_host => $::openstack_integration::config::host,
cert_file => $crt_file,
key_file => $key_file,
enable_v1_api => false,
enable_v2_api => true,
}
class { '::glance::notify::rabbitmq':
default_transport_url => os_transport_url({

2
manifests/tempest.pp
View File

@ -144,6 +144,8 @@ class openstack_integration::tempest (
cinder_backup_available => $cinder_backup,
designate_available => $designate,
glance_available => $glance,
glance_v1 => false,
glance_v2 => true,
horizon_available => $horizon,
nova_available => $nova,
neutron_available => $neutron,

5
run_tests.sh
View File

@ -245,9 +245,10 @@ if uses_debs; then
# TODO(aschultz): check this after ocata-m2 is published for UCA
# 1) this will disable the lbaas listeners tests for ubuntu only due to flakey
# failures
# 2) this will disable ceilometer's test_check_glance_v1_notifications until
# 2) this will disable ceilometer's notifications tests until
# https://review.openstack.org/#/c/389848/ is packaged in UCA/Ocata
EXCLUDES="--regex=^(?!neutron_lbaas.tests.tempest.v2.api.test_listeners_.*admin.ListenersTestJSON.*$)(?!ceilometer.tests.tempest.api.test_telemetry_notification_api.TelemetryNotificationAPITest.test_check_glance_v1_notifications.*$).*"
# because these tests were using Glance API v1 but now use v2.
EXCLUDES="--regex=^(?!neutron_lbaas.tests.tempest.v2.api.test_listeners_.*admin.ListenersTestJSON.*$)(?!ceilometer.tests.tempest.api.test_telemetry_notification_api.TelemetryNotificationAPITest.*$).*"
else
EXCLUDES=""
fi