Convert all class usage to relative names
Change-Id: I8282917b8a9e625f1db6b31544a97949733e99f1
This commit is contained in:
parent
59d2f5ecef
commit
484d087296
|
@ -1,23 +1,23 @@
|
||||||
class { '::vitrage::keystone::auth':
|
class { 'vitrage::keystone::auth':
|
||||||
admin_url => 'http://127.0.0.1:8999',
|
admin_url => 'http://127.0.0.1:8999',
|
||||||
internal_url => 'http://127.0.0.1:8999',
|
internal_url => 'http://127.0.0.1:8999',
|
||||||
public_url => 'http://127.0.0.1:8999',
|
public_url => 'http://127.0.0.1:8999',
|
||||||
password => 'a_big_secret',
|
password => 'a_big_secret',
|
||||||
}
|
}
|
||||||
class { '::vitrage': }
|
class { 'vitrage': }
|
||||||
class { '::vitrage::api':
|
class { 'vitrage::api':
|
||||||
enabled => true,
|
enabled => true,
|
||||||
keystone_password => 'a_big_secret',
|
keystone_password => 'a_big_secret',
|
||||||
keystone_identity_uri => 'http://127.0.0.1:5000/',
|
keystone_identity_uri => 'http://127.0.0.1:5000/',
|
||||||
service_name => 'httpd',
|
service_name => 'httpd',
|
||||||
}
|
}
|
||||||
include ::apache
|
include apache
|
||||||
class { '::vitrage::wsgi::apache':
|
class { 'vitrage::wsgi::apache':
|
||||||
ssl => false,
|
ssl => false,
|
||||||
}
|
}
|
||||||
class { '::vitrage::auth':
|
class { 'vitrage::auth':
|
||||||
auth_password => 'a_big_secret',
|
auth_password => 'a_big_secret',
|
||||||
}
|
}
|
||||||
class { '::vitrage::graph': }
|
class { 'vitrage::graph': }
|
||||||
class { '::vitrage::notifier': }
|
class { 'vitrage::notifier': }
|
||||||
class { '::vitrage::client': }
|
class { 'vitrage::client': }
|
||||||
|
|
|
@ -51,9 +51,9 @@ class vitrage::api (
|
||||||
$max_request_body_size = $::os_service_default,
|
$max_request_body_size = $::os_service_default,
|
||||||
) inherits vitrage::params {
|
) inherits vitrage::params {
|
||||||
|
|
||||||
include ::vitrage::deps
|
include vitrage::deps
|
||||||
include ::vitrage::params
|
include vitrage::params
|
||||||
include ::vitrage::policy
|
include vitrage::policy
|
||||||
|
|
||||||
package { 'vitrage-api':
|
package { 'vitrage-api':
|
||||||
ensure => $package_ensure,
|
ensure => $package_ensure,
|
||||||
|
@ -79,7 +79,7 @@ class vitrage::api (
|
||||||
tag => 'vitrage-service',
|
tag => 'vitrage-service',
|
||||||
}
|
}
|
||||||
} elsif $service_name == 'httpd' {
|
} elsif $service_name == 'httpd' {
|
||||||
include ::apache::params
|
include apache::params
|
||||||
service { 'vitrage-api':
|
service { 'vitrage-api':
|
||||||
ensure => 'stopped',
|
ensure => 'stopped',
|
||||||
name => $::vitrage::params::api_service_name,
|
name => $::vitrage::params::api_service_name,
|
||||||
|
|
|
@ -60,7 +60,7 @@ class vitrage::auth (
|
||||||
$auth_endpoint_type = $::os_service_default,
|
$auth_endpoint_type = $::os_service_default,
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include ::vitrage::deps
|
include vitrage::deps
|
||||||
|
|
||||||
vitrage_config {
|
vitrage_config {
|
||||||
'service_credentials/auth_url' : value => $auth_url;
|
'service_credentials/auth_url' : value => $auth_url;
|
||||||
|
|
|
@ -10,8 +10,8 @@ class vitrage::client (
|
||||||
$ensure = 'present'
|
$ensure = 'present'
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include ::vitrage::deps
|
include vitrage::deps
|
||||||
include ::vitrage::params
|
include vitrage::params
|
||||||
|
|
||||||
package { 'python-vitrageclient':
|
package { 'python-vitrageclient':
|
||||||
ensure => $ensure,
|
ensure => $ensure,
|
||||||
|
|
|
@ -28,7 +28,7 @@ class vitrage::config (
|
||||||
$vitrage_api_paste_ini = {},
|
$vitrage_api_paste_ini = {},
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include ::vitrage::deps
|
include vitrage::deps
|
||||||
|
|
||||||
validate_legacy(Hash, 'validate_hash', $vitrage_config)
|
validate_legacy(Hash, 'validate_hash', $vitrage_config)
|
||||||
validate_legacy(Hash, 'validate_hash', $vitrage_api_paste_ini)
|
validate_legacy(Hash, 'validate_hash', $vitrage_api_paste_ini)
|
||||||
|
|
|
@ -62,7 +62,7 @@ class vitrage::db (
|
||||||
$database_idle_timeout = undef,
|
$database_idle_timeout = undef,
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include ::vitrage::deps
|
include vitrage::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 \
|
||||||
|
|
|
@ -43,7 +43,7 @@ class vitrage::db::mysql(
|
||||||
$allowed_hosts = undef
|
$allowed_hosts = undef
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include ::vitrage::deps
|
include vitrage::deps
|
||||||
|
|
||||||
validate_legacy(String, 'validate_string', $password)
|
validate_legacy(String, 'validate_string', $password)
|
||||||
|
|
||||||
|
|
|
@ -32,7 +32,7 @@ class vitrage::db::postgresql(
|
||||||
$privileges = 'ALL',
|
$privileges = 'ALL',
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include ::vitrage::deps
|
include vitrage::deps
|
||||||
|
|
||||||
::openstacklib::db::postgresql { 'vitrage':
|
::openstacklib::db::postgresql { 'vitrage':
|
||||||
password_hash => postgresql_password($user, $password),
|
password_hash => postgresql_password($user, $password),
|
||||||
|
|
|
@ -12,7 +12,7 @@ class vitrage::db::sync(
|
||||||
$extra_params = undef,
|
$extra_params = undef,
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include ::vitrage::deps
|
include vitrage::deps
|
||||||
|
|
||||||
exec { 'vitrage-db-sync':
|
exec { 'vitrage-db-sync':
|
||||||
command => "vitrage-dbsync ${extra_params}",
|
command => "vitrage-dbsync ${extra_params}",
|
||||||
|
|
|
@ -19,8 +19,8 @@ class vitrage::graph (
|
||||||
$package_ensure = 'present',
|
$package_ensure = 'present',
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include ::vitrage::deps
|
include vitrage::deps
|
||||||
include ::vitrage::params
|
include vitrage::params
|
||||||
|
|
||||||
ensure_resource( 'package', [$::vitrage::params::graph_package_name],
|
ensure_resource( 'package', [$::vitrage::params::graph_package_name],
|
||||||
{ ensure => $package_ensure,
|
{ ensure => $package_ensure,
|
||||||
|
|
|
@ -230,7 +230,7 @@ class vitrage (
|
||||||
$types = $::os_service_default,
|
$types = $::os_service_default,
|
||||||
) inherits vitrage::params {
|
) inherits vitrage::params {
|
||||||
|
|
||||||
include ::vitrage::deps
|
include vitrage::deps
|
||||||
|
|
||||||
package { 'vitrage':
|
package { 'vitrage':
|
||||||
ensure => $package_ensure,
|
ensure => $package_ensure,
|
||||||
|
|
|
@ -79,7 +79,7 @@ class vitrage::keystone::auth (
|
||||||
$admin_url = 'http://127.0.0.1:8999',
|
$admin_url = 'http://127.0.0.1:8999',
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include ::vitrage::deps
|
include vitrage::deps
|
||||||
|
|
||||||
$real_service_name = pick($service_name, $auth_name)
|
$real_service_name = pick($service_name, $auth_name)
|
||||||
|
|
||||||
|
|
|
@ -202,7 +202,7 @@ class vitrage::keystone::authtoken(
|
||||||
$service_token_roles_required = $::os_service_default,
|
$service_token_roles_required = $::os_service_default,
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include ::vitrage::deps
|
include vitrage::deps
|
||||||
|
|
||||||
keystone::resource::authtoken { 'vitrage_config':
|
keystone::resource::authtoken { 'vitrage_config':
|
||||||
username => $username,
|
username => $username,
|
||||||
|
|
|
@ -121,7 +121,7 @@ class vitrage::logging(
|
||||||
$log_date_format = $::os_service_default,
|
$log_date_format = $::os_service_default,
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include ::vitrage::deps
|
include vitrage::deps
|
||||||
|
|
||||||
oslo::log { 'vitrage_config':
|
oslo::log { 'vitrage_config':
|
||||||
debug => $debug,
|
debug => $debug,
|
||||||
|
|
|
@ -24,8 +24,8 @@ class vitrage::notifier (
|
||||||
$notifiers = $::os_service_default,
|
$notifiers = $::os_service_default,
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include ::vitrage::deps
|
include vitrage::deps
|
||||||
include ::vitrage::params
|
include vitrage::params
|
||||||
|
|
||||||
if !is_service_default($notifiers) {
|
if !is_service_default($notifiers) {
|
||||||
$notifiers_orig = join(any2array($notifiers), ',')
|
$notifiers_orig = join(any2array($notifiers), ',')
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
# Parameters for puppet-vitrage
|
# Parameters for puppet-vitrage
|
||||||
#
|
#
|
||||||
class vitrage::params {
|
class vitrage::params {
|
||||||
include ::openstacklib::defaults
|
include openstacklib::defaults
|
||||||
$pyvers = $::openstacklib::defaults::pyvers
|
$pyvers = $::openstacklib::defaults::pyvers
|
||||||
|
|
||||||
$client_package_name = "python${pyvers}-vitrageclient"
|
$client_package_name = "python${pyvers}-vitrageclient"
|
||||||
|
|
|
@ -19,8 +19,8 @@ class vitrage::persistor (
|
||||||
$package_ensure = 'present',
|
$package_ensure = 'present',
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include ::vitrage::deps
|
include vitrage::deps
|
||||||
include ::vitrage::params
|
include vitrage::params
|
||||||
|
|
||||||
ensure_resource( 'package', [$::vitrage::params::persistor_package_name],
|
ensure_resource( 'package', [$::vitrage::params::persistor_package_name],
|
||||||
{ ensure => $package_ensure,
|
{ ensure => $package_ensure,
|
||||||
|
|
|
@ -28,8 +28,8 @@ class vitrage::policy (
|
||||||
$policy_path = '/etc/vitrage/policy.json',
|
$policy_path = '/etc/vitrage/policy.json',
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include ::vitrage::deps
|
include vitrage::deps
|
||||||
include ::vitrage::params
|
include vitrage::params
|
||||||
|
|
||||||
validate_legacy(Hash, 'validate_hash', $policies)
|
validate_legacy(Hash, 'validate_hash', $policies)
|
||||||
|
|
||||||
|
|
|
@ -124,12 +124,12 @@ class vitrage::wsgi::apache (
|
||||||
$custom_wsgi_process_options = {},
|
$custom_wsgi_process_options = {},
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include ::vitrage::deps
|
include vitrage::deps
|
||||||
include ::vitrage::params
|
include vitrage::params
|
||||||
include ::apache
|
include apache
|
||||||
include ::apache::mod::wsgi
|
include apache::mod::wsgi
|
||||||
if $ssl {
|
if $ssl {
|
||||||
include ::apache::mod::ssl
|
include apache::mod::ssl
|
||||||
}
|
}
|
||||||
|
|
||||||
::openstacklib::wsgi::apache { 'vitrage_wsgi':
|
::openstacklib::wsgi::apache { 'vitrage_wsgi':
|
||||||
|
|
|
@ -6,11 +6,11 @@ describe 'basic vitrage' do
|
||||||
|
|
||||||
it 'should work with no errors' do
|
it 'should work with no errors' do
|
||||||
pp= <<-EOS
|
pp= <<-EOS
|
||||||
include ::openstack_integration
|
include openstack_integration
|
||||||
include ::openstack_integration::repos
|
include openstack_integration::repos
|
||||||
include ::openstack_integration::rabbitmq
|
include openstack_integration::rabbitmq
|
||||||
include ::openstack_integration::mysql
|
include openstack_integration::mysql
|
||||||
include ::openstack_integration::keystone
|
include openstack_integration::keystone
|
||||||
|
|
||||||
case $::osfamily {
|
case $::osfamily {
|
||||||
'Debian': {
|
'Debian': {
|
||||||
|
@ -23,7 +23,7 @@ describe 'basic vitrage' do
|
||||||
package { 'python2-cotyledon':
|
package { 'python2-cotyledon':
|
||||||
ensure => present,
|
ensure => present,
|
||||||
}
|
}
|
||||||
include ::openstack_integration::vitrage
|
include openstack_integration::vitrage
|
||||||
}
|
}
|
||||||
default: {
|
default: {
|
||||||
fail("Unsupported osfamily (${::osfamily})")
|
fail("Unsupported osfamily (${::osfamily})")
|
||||||
|
|
|
@ -4,7 +4,7 @@ describe 'vitrage::api' do
|
||||||
|
|
||||||
let :pre_condition do
|
let :pre_condition do
|
||||||
"class { 'vitrage': }
|
"class { 'vitrage': }
|
||||||
class { '::vitrage::keystone::authtoken':
|
class { 'vitrage::keystone::authtoken':
|
||||||
password => 'a_big_secret',
|
password => 'a_big_secret',
|
||||||
}"
|
}"
|
||||||
end
|
end
|
||||||
|
@ -107,9 +107,9 @@ describe 'vitrage::api' do
|
||||||
end
|
end
|
||||||
|
|
||||||
let :pre_condition do
|
let :pre_condition do
|
||||||
"include ::apache
|
"include apache
|
||||||
class { 'vitrage': }
|
class { 'vitrage': }
|
||||||
class { '::vitrage::keystone::authtoken':
|
class { 'vitrage::keystone::authtoken':
|
||||||
password => 'a_big_secret',
|
password => 'a_big_secret',
|
||||||
}"
|
}"
|
||||||
end
|
end
|
||||||
|
@ -130,9 +130,9 @@ describe 'vitrage::api' do
|
||||||
end
|
end
|
||||||
|
|
||||||
let :pre_condition do
|
let :pre_condition do
|
||||||
"include ::apache
|
"include apache
|
||||||
class { 'vitrage': }
|
class { 'vitrage': }
|
||||||
class { '::vitrage::keystone::authtoken':
|
class { 'vitrage::keystone::authtoken':
|
||||||
password => 'a_big_secret',
|
password => 'a_big_secret',
|
||||||
}"
|
}"
|
||||||
end
|
end
|
||||||
|
|
|
@ -3,7 +3,7 @@ require 'spec_helper'
|
||||||
describe 'vitrage::graph' do
|
describe 'vitrage::graph' do
|
||||||
|
|
||||||
let :pre_condition do
|
let :pre_condition do
|
||||||
"class { '::vitrage': }"
|
"class { 'vitrage': }"
|
||||||
end
|
end
|
||||||
|
|
||||||
shared_examples_for 'vitrage-graph' do
|
shared_examples_for 'vitrage-graph' do
|
||||||
|
|
|
@ -3,7 +3,7 @@ require 'spec_helper'
|
||||||
describe 'vitrage::notifier' do
|
describe 'vitrage::notifier' do
|
||||||
|
|
||||||
let :pre_condition do
|
let :pre_condition do
|
||||||
"class { '::vitrage': }"
|
"class { 'vitrage': }"
|
||||||
end
|
end
|
||||||
|
|
||||||
shared_examples_for 'vitrage-notifier' do
|
shared_examples_for 'vitrage-notifier' do
|
||||||
|
|
|
@ -3,7 +3,7 @@ require 'spec_helper'
|
||||||
describe 'vitrage::persistor' do
|
describe 'vitrage::persistor' do
|
||||||
|
|
||||||
let :pre_condition do
|
let :pre_condition do
|
||||||
"class { '::vitrage': }"
|
"class { 'vitrage': }"
|
||||||
end
|
end
|
||||||
|
|
||||||
shared_examples_for 'vitrage-persistor' do
|
shared_examples_for 'vitrage-persistor' do
|
||||||
|
|
Loading…
Reference in New Issue