openstack
/
puppet-aodh
Code Issues Proposed changes
Browse Source

Convert all class usage to relative names 

Change-Id: Ib0d2c8567775e0b5aa7a0799851b340cb50b784e
changes/82/697882/1
Tobias Urdin 3 years ago
parent
663a819831
commit
d75de30b72
21 changed files with 61 additions and 62 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 20
      examples/aodh.pp
  2. 12
      manifests/api.pp
  3. 2
      manifests/auth.pp
  4. 7
      manifests/client.pp
  5. 2
      manifests/config.pp
  6. 2
      manifests/db.pp
  7. 4
      manifests/db/mysql.pp
  8. 4
      manifests/db/postgresql.pp
  9. 2
      manifests/db/sync.pp
  10. 4
      manifests/evaluator.pp
  11. 4
      manifests/init.pp
  12. 2
      manifests/keystone/auth.pp
  13. 2
      manifests/keystone/authtoken.pp
  14. 4
      manifests/listener.pp
  15. 2
      manifests/logging.pp
  16. 4
      manifests/notifier.pp
  17. 2
      manifests/params.pp
  18. 4
      manifests/policy.pp
  19. 12
      manifests/wsgi/apache.pp
  20. 12
      spec/acceptance/aodh_wsgi_apache_spec.rb
  21. 16
      spec/classes/aodh_api_spec.rb

20
examples/aodh.pp
Unescape View File

@ -1,19 +1,19 @@
class { '::aodh': }
class { '::aodh::keystone::authtoken':
class { 'aodh': }
class { 'aodh::keystone::authtoken':
password => 'a_big_secret',
}
class { '::aodh::api':
class { 'aodh::api':
enabled => true,
service_name => 'httpd',
}
include ::apache
class { '::aodh::wsgi::apache':
include apache
class { 'aodh::wsgi::apache':
ssl => false,
}
class { '::aodh::auth':
class { 'aodh::auth':
auth_password => 'a_big_secret',
}
class { '::aodh::evaluator': }
class { '::aodh::notifier': }
class { '::aodh::listener': }
class { '::aodh::client': }
class { 'aodh::evaluator': }
class { 'aodh::notifier': }
class { 'aodh::listener': }
class { 'aodh::client': }

12
manifests/api.pp
Unescape View File

@ -62,12 +62,12 @@ class aodh::api (
) inherits aodh::params {
include ::aodh::deps
include ::aodh::params
include ::aodh::policy
include aodh::deps
include aodh::params
include aodh::policy
if $auth_strategy == 'keystone' {
include ::aodh::keystone::authtoken
include aodh::keystone::authtoken
}
package { 'aodh-api':
@ -85,7 +85,7 @@ class aodh::api (
}
if $sync_db {
include ::aodh::db::sync
include aodh::db::sync
}
if $service_name == $::aodh::params::api_service_name {
@ -98,7 +98,7 @@ class aodh::api (
tag => 'aodh-service',
}
} elsif $service_name == 'httpd' {
include ::apache::params
include apache::params
service { 'aodh-api':
ensure => 'stopped',
name => $::aodh::params::api_service_name,

2
manifests/auth.pp
Unescape View File

@ -61,7 +61,7 @@ class aodh::auth (
$interface = $::os_service_default,
) {
include ::aodh::deps
include aodh::deps
aodh_config {
'service_credentials/auth_url' : value => $auth_url;

7
manifests/client.pp
Unescape View File

@ -10,8 +10,8 @@ class aodh::client (
$ensure = 'present'
) {
include ::aodh::deps
include ::aodh::params
include aodh::deps
include aodh::params
package { 'python-aodhclient':
ensure => $ensure,
@ -19,7 +19,6 @@ class aodh::client (
tag => 'openstack',
}
include '::openstacklib::openstackclient'
include openstacklib::openstackclient
}

2
manifests/config.pp
Unescape View File

@ -28,7 +28,7 @@ class aodh::config (
$aodh_api_paste_ini = {},
) {
include ::aodh::deps
include aodh::deps
validate_legacy(Hash, 'validate_hash', $aodh_config)
validate_legacy(Hash, 'validate_hash', $aodh_api_paste_ini)

2
manifests/db.pp
Unescape View File

@ -67,7 +67,7 @@ class aodh::db (
$database_idle_timeout = undef,
) {
include ::aodh::deps
include aodh::deps
if $database_idle_timeout {
warning('The database_idle_timeout parameter is deprecated. Please use \

4
manifests/db/mysql.pp
Unescape View File

@ -43,11 +43,11 @@ class aodh::db::mysql(
$allowed_hosts = undef
) {
include ::aodh::deps
include aodh::deps
validate_legacy(String, 'validate_string', $password)
::openstacklib::db::mysql { 'aodh':
openstacklib::db::mysql { 'aodh':
user => $user,
password_hash => mysql::password($password),
dbname => $dbname,

4
manifests/db/postgresql.pp
Unescape View File

@ -32,9 +32,9 @@ class aodh::db::postgresql(
$privileges = 'ALL',
) {
include ::aodh::deps
include aodh::deps
::openstacklib::db::postgresql { 'aodh':
openstacklib::db::postgresql { 'aodh':
password_hash => postgresql_password($user, $password),
dbname => $dbname,
user => $user,

2
manifests/db/sync.pp
Unescape View File

@ -9,7 +9,7 @@ class aodh::db::sync (
$user = 'aodh',
){
include ::aodh::deps
include aodh::deps
exec { 'aodh-db-sync':
command => 'aodh-dbsync --config-file /etc/aodh/aodh.conf',

4
manifests/evaluator.pp
Unescape View File

@ -29,8 +29,8 @@ class aodh::evaluator (
$evaluation_interval = $::os_service_default,
) {
include ::aodh::deps
include ::aodh::params
include aodh::deps
include aodh::params
aodh_config {
'DEFAULT/evaluation_interval' : value => $evaluation_interval;

4
manifests/init.pp
Unescape View File

@ -271,8 +271,8 @@ class aodh (
$purge_config = false,
) inherits aodh::params {
include ::aodh::deps
include ::aodh::db
include aodh::deps
include aodh::db
package { 'aodh':
ensure => $package_ensure,

2
manifests/keystone/auth.pp
Unescape View File

@ -79,7 +79,7 @@ class aodh::keystone::auth (
$admin_url = 'http://127.0.0.1:8042',
) {
include ::aodh::deps
include aodh::deps
keystone::resource::service_identity { 'aodh':
configure_user => $configure_user,

2
manifests/keystone/authtoken.pp
Unescape View File

@ -214,7 +214,7 @@ class aodh::keystone::authtoken(
$service_token_roles_required = $::os_service_default,
) {
include ::aodh::deps
include aodh::deps
if is_service_default($password) {
fail('Please set password for Aodh service user')

4
manifests/listener.pp
Unescape View File

@ -19,8 +19,8 @@ class aodh::listener (
$package_ensure = 'present',
) {
include ::aodh::deps
include ::aodh::params
include aodh::deps
include aodh::params
ensure_resource( 'package', [$::aodh::params::listener_package_name],
{ ensure => $package_ensure,

2
manifests/logging.pp
Unescape View File

@ -120,7 +120,7 @@ class aodh::logging(
$log_date_format = $::os_service_default,
) {
include ::aodh::deps
include aodh::deps
oslo::log { 'aodh_config':
debug => $debug,

4
manifests/notifier.pp
Unescape View File

@ -19,8 +19,8 @@ class aodh::notifier (
$package_ensure = 'present',
) {
include ::aodh::deps
include ::aodh::params
include aodh::deps
include aodh::params
ensure_resource( 'package', [$::aodh::params::notifier_package_name],
{ ensure => $package_ensure,

2
manifests/params.pp
Unescape View File

@ -1,7 +1,7 @@
# Parameters for puppet-aodh
#
class aodh::params {
include ::openstacklib::defaults
include openstacklib::defaults
$pyvers = $::openstacklib::defaults::pyvers
$client_package_name = "python${pyvers}-aodhclient"

4
manifests/policy.pp
Unescape View File

@ -28,8 +28,8 @@ class aodh::policy (
$policy_path = '/etc/aodh/policy.json',
) {
include ::aodh::deps
include ::aodh::params
include aodh::deps
include aodh::params
validate_legacy(Hash, 'validate_hash', $policies)

12
manifests/wsgi/apache.pp
Unescape View File

@ -124,19 +124,19 @@ class aodh::wsgi::apache (
$custom_wsgi_process_options = {},
) {
include ::aodh::deps
include ::aodh::params
include ::apache
include ::apache::mod::wsgi
include aodh::deps
include aodh::params
include apache
include apache::mod::wsgi
if $ssl {
include ::apache::mod::ssl
include apache::mod::ssl
}
# NOTE(aschultz): needed because the packaging may introduce some apache
# configuration files that apache may remove. See LP#1657847
Anchor['aodh::install::end'] -> Class['apache']
::openstacklib::wsgi::apache { 'aodh_wsgi':
openstacklib::wsgi::apache { 'aodh_wsgi':
bind_host => $bind_host,
bind_port => $port,
group => 'aodh',

12
spec/acceptance/aodh_wsgi_apache_spec.rb
Unescape View File

@ -6,12 +6,12 @@ describe 'basic aodh' do
it 'should work with no errors' do
pp= <<-EOS
include ::openstack_integration
include ::openstack_integration::repos
include ::openstack_integration::rabbitmq
include ::openstack_integration::mysql
include ::openstack_integration::keystone
include ::openstack_integration::aodh
include openstack_integration
include openstack_integration::repos
include openstack_integration::rabbitmq
include openstack_integration::mysql
include openstack_integration::keystone
include openstack_integration::aodh
EOS

16
spec/classes/aodh_api_spec.rb
Unescape View File

@ -4,8 +4,8 @@ describe 'aodh::api' do
let :pre_condition do
"class { 'aodh': }
include ::aodh::db
class { '::aodh::keystone::authtoken':
include aodh::db
class { 'aodh::keystone::authtoken':
password => 'a_big_secret',
}"
end
@ -129,10 +129,10 @@ describe 'aodh::api' do
end
let :pre_condition do
"include ::apache
include ::aodh::db
"include apache
include aodh::db
class { 'aodh': }
class { '::aodh::keystone::authtoken':
class { 'aodh::keystone::authtoken':
password => 'a_big_secret',
}"
end
@ -153,10 +153,10 @@ describe 'aodh::api' do
end
let :pre_condition do
"include ::apache
include ::aodh::db
"include apache
include aodh::db
class { 'aodh': }
class { '::aodh::keystone::authtoken':
class { 'aodh::keystone::authtoken':
password => 'a_big_secret',
}"
end

Write Preview
Loading…
Cancel
Save