Browse Source

Convert all class usage to relative names

Change-Id: If72477841529ea17c10963846c5ad0fb65e373ba
changes/09/697909/1
Tobias Urdin 2 years ago
parent
commit
48f8bb2723
  1. 2
      examples/init.pp
  2. 2
      examples/workflow.pp
  3. 10
      manifests/api.pp
  4. 4
      manifests/client.pp
  5. 2
      manifests/config.pp
  6. 2
      manifests/cors.pp
  7. 4
      manifests/cron_trigger.pp
  8. 2
      manifests/db.pp
  9. 2
      manifests/db/mysql.pp
  10. 2
      manifests/db/postgresql.pp
  11. 4
      manifests/db/sync.pp
  12. 4
      manifests/engine.pp
  13. 4
      manifests/event_engine.pp
  14. 4
      manifests/executor.pp
  15. 8
      manifests/init.pp
  16. 2
      manifests/keystone/auth.pp
  17. 2
      manifests/keystone/authtoken.pp
  18. 2
      manifests/logging.pp
  19. 4
      manifests/notifier.pp
  20. 2
      manifests/params.pp
  21. 4
      manifests/policy.pp
  22. 10
      manifests/wsgi/apache.pp
  23. 12
      spec/acceptance/basic_mistral_spec.rb
  24. 10
      spec/classes/mistral_api_spec.rb
  25. 2
      spec/classes/mistral_init_spec.rb

2
examples/init.pp

@ -9,4 +9,4 @@
# Learn more about module testing here:
# https://puppet.com/docs/puppet/latest/bgtm.html#testing-your-module
#
include ::mistral
include mistral

2
examples/workflow.pp

@ -1 +1 @@
class { '::mistral:workflow': }
class { 'mistral:workflow': }

10
manifests/api.pp

@ -72,12 +72,12 @@ class mistral::api (
$auth_strategy = 'keystone',
) inherits mistral::params {
include ::mistral::deps
include ::mistral::params
include ::mistral::policy
include mistral::deps
include mistral::params
include mistral::policy
if $auth_strategy == 'keystone' {
include ::mistral::keystone::authtoken
include mistral::keystone::authtoken
}
package { 'mistral-api':
@ -104,7 +104,7 @@ class mistral::api (
tag => 'mistral-service',
}
} elsif $service_name == 'httpd' {
include ::apache::params
include apache::params
service { 'mistral-api':
ensure => 'stopped',
name => $::mistral::params::api_service_name,

4
manifests/client.pp

@ -11,8 +11,8 @@ class mistral::client(
$package_ensure = 'present'
) {
include ::mistral::deps
include ::mistral::params
include mistral::deps
include mistral::params
package { 'python-mistralclient':
ensure => $package_ensure,

2
manifests/config.pp

@ -24,7 +24,7 @@ class mistral::config (
$mistral_config = {},
) {
include ::mistral::deps
include mistral::deps
validate_legacy(Hash, 'validate_hash', $mistral_config)

2
manifests/cors.pp

@ -45,7 +45,7 @@ class mistral::cors (
$allow_headers = $::os_service_default,
) {
include ::mistral::deps
include mistral::deps
oslo::cors { 'mistral_config':
allowed_origin => $allowed_origin,

4
manifests/cron_trigger.pp

@ -28,8 +28,8 @@ class mistral::cron_trigger (
$execution_interval = $::os_service_default,
) {
include ::mistral::deps
include ::mistral::params
include mistral::deps
include mistral::params
mistral_config {
'cron_trigger/enabled': value => $enabled;

2
manifests/db.pp

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

2
manifests/db/mysql.pp

@ -43,7 +43,7 @@ class mistral::db::mysql(
$allowed_hosts = undef
) {
include ::mistral::deps
include mistral::deps
validate_legacy(String, 'validate_string', $password)

2
manifests/db/postgresql.pp

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

4
manifests/db/sync.pp

@ -3,8 +3,8 @@
#
class mistral::db::sync {
include ::mistral::deps
include ::mistral::params
include mistral::deps
include mistral::params
exec { 'mistral-db-sync':
command => $::mistral::params::db_sync_command,

4
manifests/engine.pp

@ -59,8 +59,8 @@ class mistral::engine (
$older_than = $::os_service_default,
) {
include ::mistral::deps
include ::mistral::params
include mistral::deps
include mistral::params
package { 'mistral-engine':
ensure => $package_ensure,

4
manifests/event_engine.pp

@ -37,8 +37,8 @@ class mistral::event_engine (
$event_definitions_cfg_file = $::os_service_default,
) {
include ::mistral::deps
include ::mistral::params
include mistral::deps
include mistral::params
package { 'mistral-event-engine':
ensure => $package_ensure,

4
manifests/executor.pp

@ -37,8 +37,8 @@ class mistral::executor (
$version = $::os_service_default,
) {
include ::mistral::deps
include ::mistral::params
include mistral::deps
include mistral::params
package { 'mistral-executor':
ensure => $package_ensure,

8
manifests/init.pp

@ -222,9 +222,9 @@ class mistral(
$first_heartbeat_timeout = $::os_service_default,
){
include ::mistral::deps
include ::mistral::params
include ::mistral::db
include mistral::deps
include mistral::params
include mistral::db
package { 'mistral-common':
ensure => $package_ensure,
@ -275,6 +275,6 @@ class mistral(
}
if $sync_db {
include ::mistral::db::sync
include mistral::db::sync
}
}

2
manifests/keystone/auth.pp

@ -81,7 +81,7 @@ class mistral::keystone::auth(
$service_description = 'OpenStack Workflow Service',
) {
include ::mistral::deps
include mistral::deps
validate_legacy(String, 'validate_string', $password)

2
manifests/keystone/authtoken.pp

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

2
manifests/logging.pp

@ -120,7 +120,7 @@ class mistral::logging(
$log_date_format = $::os_service_default,
) {
include ::mistral::deps
include mistral::deps
oslo::log { 'mistral_config':
use_syslog => $use_syslog,

4
manifests/notifier.pp

@ -34,8 +34,8 @@ class mistral::notifier(
$notify_publishers = $::os_service_default,
) {
include ::mistral::deps
include ::mistral::params
include mistral::deps
include mistral::params
mistral_config {
'notifier/type': value => $type;

2
manifests/params.pp

@ -3,7 +3,7 @@
# Parameters for puppet-mistral
#
class mistral::params {
include ::openstacklib::defaults
include openstacklib::defaults
$pyvers = $::openstacklib::defaults::pyvers
$client_package = "python${pyvers}-mistralclient"

4
manifests/policy.pp

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

10
manifests/wsgi/apache.pp

@ -123,12 +123,12 @@ class mistral::wsgi::apache (
$custom_wsgi_process_options = {},
) {
include ::mistral::deps
include ::mistral::params
include ::apache
include ::apache::mod::wsgi
include mistral::deps
include mistral::params
include apache
include apache::mod::wsgi
if $ssl {
include ::apache::mod::ssl
include apache::mod::ssl
}
# The httpd package is untagged, but needs to have ordering enforced,

12
spec/acceptance/basic_mistral_spec.rb

@ -6,12 +6,12 @@ describe 'basic mistral' 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::mistral
include openstack_integration
include openstack_integration::repos
include openstack_integration::rabbitmq
include openstack_integration::mysql
include openstack_integration::keystone
include openstack_integration::mistral
EOS

10
spec/classes/mistral_api_spec.rb

@ -15,7 +15,7 @@ describe 'mistral::api' do
end
let :pre_condition do
"class { '::mistral::keystone::authtoken':
"class { 'mistral::keystone::authtoken':
password => 'foo',
}"
end
@ -103,10 +103,10 @@ describe 'mistral::api' do
end
let :pre_condition do
"include ::apache
include ::mistral::db
class { '::mistral': }
class { '::mistral::keystone::authtoken':
"include apache
include mistral::db
class { 'mistral': }
class { 'mistral::keystone::authtoken':
password => 'foo',
}"
end

2
spec/classes/mistral_init_spec.rb

@ -9,7 +9,7 @@ describe 'mistral' do
end
let :pre_condition do
"class { '::mistral::keystone::authtoken':
"class { 'mistral::keystone::authtoken':
password => 'foo',
}"
end

Loading…
Cancel
Save