Convert all class usage to relative names
Change-Id: I9ff8d888e367a46ab89e3668bf4ba76c4c7c127c
This commit is contained in:
parent
63f183e7d6
commit
ed9298e996
|
@ -7,17 +7,17 @@
|
||||||
# default_store is set at that point, then the first store in the list 'stores'
|
# default_store is set at that point, then the first store in the list 'stores'
|
||||||
# provided will be made the default).
|
# provided will be made the default).
|
||||||
|
|
||||||
class { '::glance::backend::file':
|
class { 'glance::backend::file':
|
||||||
multi_store => true,
|
multi_store => true,
|
||||||
}
|
}
|
||||||
|
|
||||||
class { '::glance::backend::swift':
|
class { 'glance::backend::swift':
|
||||||
swift_store_user => 'demo',
|
swift_store_user => 'demo',
|
||||||
swift_store_key => 'secrete',
|
swift_store_key => 'secrete',
|
||||||
multi_store => true,
|
multi_store => true,
|
||||||
}
|
}
|
||||||
|
|
||||||
class { '::glance::api':
|
class { 'glance::api':
|
||||||
keystone_password => 'a_big_secret',
|
keystone_password => 'a_big_secret',
|
||||||
stores => ['file', 'swift'],
|
stores => ['file', 'swift'],
|
||||||
default_store => 'swift',
|
default_store => 'swift',
|
||||||
|
|
|
@ -7,12 +7,12 @@
|
||||||
# or it will attempt to override the default set by the backend class and result
|
# or it will attempt to override the default set by the backend class and result
|
||||||
# in an error.
|
# in an error.
|
||||||
|
|
||||||
class { '::glance::backend::swift':
|
class { 'glance::backend::swift':
|
||||||
swift_store_user => 'demo',
|
swift_store_user => 'demo',
|
||||||
swift_store_key => 'secrete',
|
swift_store_key => 'secrete',
|
||||||
}
|
}
|
||||||
|
|
||||||
class { '::glance::api':
|
class { 'glance::api':
|
||||||
keystone_password => 'a_big_secret',
|
keystone_password => 'a_big_secret',
|
||||||
stores => ['swift'],
|
stores => ['swift'],
|
||||||
}
|
}
|
||||||
|
|
|
@ -387,13 +387,13 @@ class glance::api(
|
||||||
$multi_store = false,
|
$multi_store = false,
|
||||||
) inherits glance {
|
) inherits glance {
|
||||||
|
|
||||||
include ::glance::deps
|
include glance::deps
|
||||||
include ::glance::policy
|
include glance::policy
|
||||||
include ::glance::api::db
|
include glance::api::db
|
||||||
|
|
||||||
if $sync_db {
|
if $sync_db {
|
||||||
include ::glance::db::sync
|
include glance::db::sync
|
||||||
include ::glance::db::metadefs
|
include glance::db::metadefs
|
||||||
}
|
}
|
||||||
|
|
||||||
if ( $glance::params::api_package_name != $glance::params::registry_package_name ) {
|
if ( $glance::params::api_package_name != $glance::params::registry_package_name ) {
|
||||||
|
@ -597,7 +597,7 @@ enabled_backends instead.')
|
||||||
|
|
||||||
# keystone config
|
# keystone config
|
||||||
if $auth_strategy == 'keystone' {
|
if $auth_strategy == 'keystone' {
|
||||||
include ::glance::api::authtoken
|
include glance::api::authtoken
|
||||||
}
|
}
|
||||||
|
|
||||||
oslo::middleware { 'glance_api_config':
|
oslo::middleware { 'glance_api_config':
|
||||||
|
|
|
@ -214,7 +214,7 @@ class glance::api::authtoken(
|
||||||
$service_token_roles_required = $::os_service_default,
|
$service_token_roles_required = $::os_service_default,
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include ::glance::deps
|
include glance::deps
|
||||||
|
|
||||||
if is_service_default($password) {
|
if is_service_default($password) {
|
||||||
fail('Please set password for Glance service user')
|
fail('Please set password for Glance service user')
|
||||||
|
|
|
@ -62,7 +62,7 @@ class glance::api::db (
|
||||||
$database_idle_timeout = undef,
|
$database_idle_timeout = undef,
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include ::glance::deps
|
include glance::deps
|
||||||
|
|
||||||
if $database_idle_timeout {
|
if $database_idle_timeout {
|
||||||
warning('The database_idle_timeout parameter is deprecated. Please use \
|
warning('The database_idle_timeout parameter is deprecated. Please use \
|
||||||
|
|
|
@ -120,7 +120,7 @@ class glance::api::logging(
|
||||||
$log_date_format = $::os_service_default,
|
$log_date_format = $::os_service_default,
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include ::glance::deps
|
include glance::deps
|
||||||
|
|
||||||
oslo::log { 'glance_api_config':
|
oslo::log { 'glance_api_config':
|
||||||
debug => $debug,
|
debug => $debug,
|
||||||
|
|
|
@ -86,7 +86,7 @@ class glance::backend::cinder(
|
||||||
$multi_store = false,
|
$multi_store = false,
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include ::glance::deps
|
include glance::deps
|
||||||
|
|
||||||
warning('glance::backend::cinder is deprecated. Use glance::backend::multistore::cinder instead.')
|
warning('glance::backend::cinder is deprecated. Use glance::backend::multistore::cinder instead.')
|
||||||
|
|
||||||
|
|
|
@ -18,7 +18,7 @@ class glance::backend::file(
|
||||||
$multi_store = false,
|
$multi_store = false,
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include ::glance::deps
|
include glance::deps
|
||||||
|
|
||||||
warning('glance::backend::file is deprecated. Use glance::backend::multistore::file instead.')
|
warning('glance::backend::file is deprecated. Use glance::backend::multistore::file instead.')
|
||||||
|
|
||||||
|
|
|
@ -84,7 +84,7 @@ define glance::backend::multistore::cinder(
|
||||||
$store_description = $::os_service_default,
|
$store_description = $::os_service_default,
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include ::glance::deps
|
include glance::deps
|
||||||
|
|
||||||
glance_api_config {
|
glance_api_config {
|
||||||
"${name}/cinder_api_insecure": value => $cinder_api_insecure;
|
"${name}/cinder_api_insecure": value => $cinder_api_insecure;
|
||||||
|
|
|
@ -33,7 +33,7 @@ define glance::backend::multistore::file(
|
||||||
$store_description = $::os_service_default,
|
$store_description = $::os_service_default,
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include ::glance::deps
|
include glance::deps
|
||||||
|
|
||||||
glance_api_config {
|
glance_api_config {
|
||||||
"${name}/filesystem_store_datadir": value => $filesystem_store_datadir;
|
"${name}/filesystem_store_datadir": value => $filesystem_store_datadir;
|
||||||
|
|
|
@ -63,8 +63,8 @@ define glance::backend::multistore::rbd(
|
||||||
$store_description = $::os_service_default,
|
$store_description = $::os_service_default,
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include ::glance::deps
|
include glance::deps
|
||||||
include ::glance::params
|
include glance::params
|
||||||
|
|
||||||
glance_api_config {
|
glance_api_config {
|
||||||
"${name}/rbd_store_ceph_conf": value => $rbd_store_ceph_conf;
|
"${name}/rbd_store_ceph_conf": value => $rbd_store_ceph_conf;
|
||||||
|
|
|
@ -93,8 +93,8 @@ define glance::backend::multistore::swift(
|
||||||
$store_description = $::os_service_default,
|
$store_description = $::os_service_default,
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include ::glance::deps
|
include glance::deps
|
||||||
include ::swift::client
|
include swift::client
|
||||||
|
|
||||||
Class['swift::client'] -> Anchor['glance::install::end']
|
Class['swift::client'] -> Anchor['glance::install::end']
|
||||||
Service<| tag == 'swift-service' |> -> Service['glance-api']
|
Service<| tag == 'swift-service' |> -> Service['glance-api']
|
||||||
|
|
|
@ -90,7 +90,7 @@ define glance::backend::multistore::vsphere(
|
||||||
$store_description = $::os_service_default,
|
$store_description = $::os_service_default,
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include ::glance::deps
|
include glance::deps
|
||||||
|
|
||||||
glance_api_config {
|
glance_api_config {
|
||||||
"${name}/vmware_insecure": value => $vmware_insecure;
|
"${name}/vmware_insecure": value => $vmware_insecure;
|
||||||
|
|
|
@ -47,8 +47,8 @@ class glance::backend::rbd(
|
||||||
$multi_store = false,
|
$multi_store = false,
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include ::glance::deps
|
include glance::deps
|
||||||
include ::glance::params
|
include glance::params
|
||||||
|
|
||||||
warning('glance::backend::rbd is deprecated. Use glance::backend::multistore::rbd instead.')
|
warning('glance::backend::rbd is deprecated. Use glance::backend::multistore::rbd instead.')
|
||||||
|
|
||||||
|
|
|
@ -73,8 +73,8 @@ class glance::backend::swift(
|
||||||
$multi_store = false,
|
$multi_store = false,
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include ::glance::deps
|
include glance::deps
|
||||||
include ::swift::client
|
include swift::client
|
||||||
|
|
||||||
warning('glance::backend::swift is deprecated. Use glance::backend::multistore::swift instead.')
|
warning('glance::backend::swift is deprecated. Use glance::backend::multistore::swift instead.')
|
||||||
|
|
||||||
|
|
|
@ -91,7 +91,7 @@ class glance::backend::vsphere(
|
||||||
$multi_store = false,
|
$multi_store = false,
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include ::glance::deps
|
include glance::deps
|
||||||
|
|
||||||
warning('glance::backend::vsphere is deprecated. Use glance::backend::multistore::vsphere instead.')
|
warning('glance::backend::vsphere is deprecated. Use glance::backend::multistore::vsphere instead.')
|
||||||
|
|
||||||
|
|
|
@ -33,8 +33,8 @@ class glance::cache::cleaner(
|
||||||
$command_options = '',
|
$command_options = '',
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include ::glance::deps
|
include glance::deps
|
||||||
include ::glance::params
|
include glance::params
|
||||||
|
|
||||||
cron { 'glance-cache-cleaner':
|
cron { 'glance-cache-cleaner':
|
||||||
command => "${glance::params::cache_cleaner_command} ${command_options}",
|
command => "${glance::params::cache_cleaner_command} ${command_options}",
|
||||||
|
|
|
@ -114,7 +114,7 @@ class glance::cache::logging(
|
||||||
$log_date_format = $::os_service_default,
|
$log_date_format = $::os_service_default,
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include ::glance::deps
|
include glance::deps
|
||||||
|
|
||||||
oslo::log { 'glance_cache_config':
|
oslo::log { 'glance_cache_config':
|
||||||
debug => $debug,
|
debug => $debug,
|
||||||
|
|
|
@ -33,8 +33,8 @@ class glance::cache::pruner(
|
||||||
$command_options = '',
|
$command_options = '',
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include ::glance::deps
|
include glance::deps
|
||||||
include ::glance::params
|
include glance::params
|
||||||
|
|
||||||
cron { 'glance-cache-pruner':
|
cron { 'glance-cache-pruner':
|
||||||
command => "${glance::params::cache_pruner_command} ${command_options}",
|
command => "${glance::params::cache_pruner_command} ${command_options}",
|
||||||
|
|
|
@ -10,8 +10,8 @@ class glance::client(
|
||||||
$ensure = 'present'
|
$ensure = 'present'
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include ::glance::deps
|
include glance::deps
|
||||||
include ::glance::params
|
include glance::params
|
||||||
|
|
||||||
package { 'python-glanceclient':
|
package { 'python-glanceclient':
|
||||||
ensure => $ensure,
|
ensure => $ensure,
|
||||||
|
|
|
@ -47,7 +47,7 @@ class glance::config (
|
||||||
$image_import_config = {},
|
$image_import_config = {},
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include ::glance::deps
|
include glance::deps
|
||||||
|
|
||||||
validate_legacy(Hash, 'validate_hash', $api_config)
|
validate_legacy(Hash, 'validate_hash', $api_config)
|
||||||
validate_legacy(Hash, 'validate_hash', $api_paste_ini_config)
|
validate_legacy(Hash, 'validate_hash', $api_paste_ini_config)
|
||||||
|
|
|
@ -13,8 +13,8 @@ class glance::db::metadefs(
|
||||||
$extra_params = '',
|
$extra_params = '',
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include ::glance::deps
|
include glance::deps
|
||||||
include ::glance::params
|
include glance::params
|
||||||
|
|
||||||
exec { 'glance-manage db_load_metadefs':
|
exec { 'glance-manage db_load_metadefs':
|
||||||
command => "glance-manage ${extra_params} db_load_metadefs",
|
command => "glance-manage ${extra_params} db_load_metadefs",
|
||||||
|
|
|
@ -40,7 +40,7 @@ class glance::db::mysql(
|
||||||
$collate = 'utf8_general_ci',
|
$collate = 'utf8_general_ci',
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include ::glance::deps
|
include glance::deps
|
||||||
|
|
||||||
validate_legacy(String, 'validate_string', $password)
|
validate_legacy(String, 'validate_string', $password)
|
||||||
|
|
||||||
|
|
|
@ -32,7 +32,7 @@ class glance::db::postgresql(
|
||||||
$privileges = 'ALL',
|
$privileges = 'ALL',
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include ::glance::deps
|
include glance::deps
|
||||||
|
|
||||||
::openstacklib::db::postgresql { 'glance':
|
::openstacklib::db::postgresql { 'glance':
|
||||||
password_hash => postgresql_password($user, $password),
|
password_hash => postgresql_password($user, $password),
|
||||||
|
|
|
@ -13,7 +13,7 @@ class glance::db::sync(
|
||||||
$extra_params = '',
|
$extra_params = '',
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include ::glance::deps
|
include glance::deps
|
||||||
|
|
||||||
exec { 'glance-manage db_sync':
|
exec { 'glance-manage db_sync':
|
||||||
command => "glance-manage ${extra_params} db_sync",
|
command => "glance-manage ${extra_params} db_sync",
|
||||||
|
|
|
@ -13,8 +13,8 @@ class glance(
|
||||||
$package_ensure = 'present'
|
$package_ensure = 'present'
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include ::glance::deps
|
include glance::deps
|
||||||
include ::glance::params
|
include glance::params
|
||||||
|
|
||||||
if ( $glance::params::api_package_name == $glance::params::registry_package_name ) {
|
if ( $glance::params::api_package_name == $glance::params::registry_package_name ) {
|
||||||
package { $::glance::params::api_package_name :
|
package { $::glance::params::api_package_name :
|
||||||
|
|
|
@ -88,7 +88,7 @@ class glance::keystone::auth(
|
||||||
$internal_url = 'http://127.0.0.1:9292',
|
$internal_url = 'http://127.0.0.1:9292',
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include ::glance::deps
|
include glance::deps
|
||||||
|
|
||||||
if $configure_endpoint {
|
if $configure_endpoint {
|
||||||
Keystone_endpoint["${region}/${service_name}::${service_type}"] ~> Anchor['glance::service::begin']
|
Keystone_endpoint["${region}/${service_name}::${service_type}"] ~> Anchor['glance::service::begin']
|
||||||
|
|
|
@ -130,7 +130,7 @@ class glance::notify::rabbitmq(
|
||||||
$notification_driver = $::os_service_default,
|
$notification_driver = $::os_service_default,
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include ::glance::deps
|
include glance::deps
|
||||||
|
|
||||||
oslo::messaging::rabbit { ['glance_api_config', 'glance_registry_config']:
|
oslo::messaging::rabbit { ['glance_api_config', 'glance_registry_config']:
|
||||||
rabbit_ha_queues => $rabbit_ha_queues,
|
rabbit_ha_queues => $rabbit_ha_queues,
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
# these parameters need to be accessed from several locations and
|
# these parameters need to be accessed from several locations and
|
||||||
# should be considered to be constant
|
# should be considered to be constant
|
||||||
class glance::params {
|
class glance::params {
|
||||||
include ::openstacklib::defaults
|
include openstacklib::defaults
|
||||||
$pyvers = $::openstacklib::defaults::pyvers
|
$pyvers = $::openstacklib::defaults::pyvers
|
||||||
|
|
||||||
$client_package_name = "python${pyvers}-glanceclient"
|
$client_package_name = "python${pyvers}-glanceclient"
|
||||||
|
|
|
@ -28,8 +28,8 @@ class glance::policy (
|
||||||
$policy_path = '/etc/glance/policy.json',
|
$policy_path = '/etc/glance/policy.json',
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include ::glance::deps
|
include glance::deps
|
||||||
include ::glance::params
|
include glance::params
|
||||||
|
|
||||||
validate_legacy(Hash, 'validate_hash', $policies)
|
validate_legacy(Hash, 'validate_hash', $policies)
|
||||||
|
|
||||||
|
|
|
@ -120,8 +120,8 @@ class glance::registry(
|
||||||
$enable_v1_registry = false,
|
$enable_v1_registry = false,
|
||||||
) inherits glance {
|
) inherits glance {
|
||||||
|
|
||||||
include ::glance::deps
|
include glance::deps
|
||||||
include ::glance::registry::db
|
include glance::registry::db
|
||||||
|
|
||||||
if ( $glance::params::api_package_name != $glance::params::registry_package_name ) {
|
if ( $glance::params::api_package_name != $glance::params::registry_package_name ) {
|
||||||
ensure_packages($glance::params::registry_package_name,
|
ensure_packages($glance::params::registry_package_name,
|
||||||
|
@ -159,7 +159,7 @@ class glance::registry(
|
||||||
|
|
||||||
# keystone config
|
# keystone config
|
||||||
if $auth_strategy == 'keystone' {
|
if $auth_strategy == 'keystone' {
|
||||||
include ::glance::registry::authtoken
|
include glance::registry::authtoken
|
||||||
}
|
}
|
||||||
|
|
||||||
# SSL Options
|
# SSL Options
|
||||||
|
|
|
@ -214,7 +214,7 @@ class glance::registry::authtoken(
|
||||||
$service_token_roles_required = $::os_service_default,
|
$service_token_roles_required = $::os_service_default,
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include ::glance::deps
|
include glance::deps
|
||||||
|
|
||||||
if is_service_default($password) {
|
if is_service_default($password) {
|
||||||
fail('Please set password for Glance service user')
|
fail('Please set password for Glance service user')
|
||||||
|
|
|
@ -62,7 +62,7 @@ class glance::registry::db (
|
||||||
$database_idle_timeout = undef,
|
$database_idle_timeout = undef,
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include ::glance::deps
|
include glance::deps
|
||||||
|
|
||||||
if $database_idle_timeout {
|
if $database_idle_timeout {
|
||||||
warning('The database_idle_timeout parameter is deprecated. Please use \
|
warning('The database_idle_timeout parameter is deprecated. Please use \
|
||||||
|
|
|
@ -120,7 +120,7 @@ class glance::registry::logging(
|
||||||
$log_date_format = $::os_service_default,
|
$log_date_format = $::os_service_default,
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include ::glance::deps
|
include glance::deps
|
||||||
|
|
||||||
oslo::log { 'glance_registry_config':
|
oslo::log { 'glance_registry_config':
|
||||||
debug => $debug,
|
debug => $debug,
|
||||||
|
|
|
@ -4,11 +4,11 @@ describe 'glance class' do
|
||||||
|
|
||||||
context 'default parameters' do
|
context 'default parameters' do
|
||||||
pp= <<-EOS
|
pp= <<-EOS
|
||||||
include ::openstack_integration
|
include openstack_integration
|
||||||
include ::openstack_integration::repos
|
include openstack_integration::repos
|
||||||
include ::openstack_integration::mysql
|
include openstack_integration::mysql
|
||||||
include ::openstack_integration::keystone
|
include openstack_integration::keystone
|
||||||
include ::openstack_integration::glance
|
include openstack_integration::glance
|
||||||
|
|
||||||
glance_image { 'test_image':
|
glance_image { 'test_image':
|
||||||
ensure => present,
|
ensure => present,
|
||||||
|
|
|
@ -2,7 +2,7 @@ require 'spec_helper'
|
||||||
|
|
||||||
describe 'glance::api' do
|
describe 'glance::api' do
|
||||||
let :pre_condition do
|
let :pre_condition do
|
||||||
"class { '::glance::api::authtoken':
|
"class { 'glance::api::authtoken':
|
||||||
password => 'ChangeMe',
|
password => 'ChangeMe',
|
||||||
}"
|
}"
|
||||||
end
|
end
|
||||||
|
|
|
@ -11,7 +11,7 @@ describe 'glance::backend::swift' do
|
||||||
|
|
||||||
let :pre_condition do
|
let :pre_condition do
|
||||||
'class { "glance::api::authtoken": password => "pass" }
|
'class { "glance::api::authtoken": password => "pass" }
|
||||||
include ::glance::api'
|
include glance::api'
|
||||||
end
|
end
|
||||||
|
|
||||||
describe 'when default parameters' do
|
describe 'when default parameters' do
|
||||||
|
|
|
@ -129,7 +129,7 @@ describe 'glance::keystone::auth' do
|
||||||
describe 'when configuring glance-api and the keystone endpoint' do
|
describe 'when configuring glance-api and the keystone endpoint' do
|
||||||
let :pre_condition do
|
let :pre_condition do
|
||||||
"class { 'glance::api::authtoken': password => 'test' }
|
"class { 'glance::api::authtoken': password => 'test' }
|
||||||
include ::glance::api"
|
include glance::api"
|
||||||
end
|
end
|
||||||
|
|
||||||
let :params do
|
let :params do
|
||||||
|
|
|
@ -31,7 +31,7 @@ describe 'glance::backend::multistore::swift' do
|
||||||
|
|
||||||
let :pre_condition do
|
let :pre_condition do
|
||||||
'class { "glance::api::authtoken": password => "pass" }
|
'class { "glance::api::authtoken": password => "pass" }
|
||||||
include ::glance::api'
|
include glance::api'
|
||||||
end
|
end
|
||||||
|
|
||||||
describe 'when default parameters' do
|
describe 'when default parameters' do
|
||||||
|
|
Loading…
Reference in New Issue