Convert all class usage to relative names
Change-Id: If72477841529ea17c10963846c5ad0fb65e373ba
This commit is contained in:
parent
4cc9e06077
commit
48f8bb2723
|
@ -9,4 +9,4 @@
|
||||||
# Learn more about module testing here:
|
# Learn more about module testing here:
|
||||||
# https://puppet.com/docs/puppet/latest/bgtm.html#testing-your-module
|
# https://puppet.com/docs/puppet/latest/bgtm.html#testing-your-module
|
||||||
#
|
#
|
||||||
include ::mistral
|
include mistral
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
class { '::mistral:workflow': }
|
class { 'mistral:workflow': }
|
||||||
|
|
|
@ -72,12 +72,12 @@ class mistral::api (
|
||||||
$auth_strategy = 'keystone',
|
$auth_strategy = 'keystone',
|
||||||
) inherits mistral::params {
|
) inherits mistral::params {
|
||||||
|
|
||||||
include ::mistral::deps
|
include mistral::deps
|
||||||
include ::mistral::params
|
include mistral::params
|
||||||
include ::mistral::policy
|
include mistral::policy
|
||||||
|
|
||||||
if $auth_strategy == 'keystone' {
|
if $auth_strategy == 'keystone' {
|
||||||
include ::mistral::keystone::authtoken
|
include mistral::keystone::authtoken
|
||||||
}
|
}
|
||||||
|
|
||||||
package { 'mistral-api':
|
package { 'mistral-api':
|
||||||
|
@ -104,7 +104,7 @@ class mistral::api (
|
||||||
tag => 'mistral-service',
|
tag => 'mistral-service',
|
||||||
}
|
}
|
||||||
} elsif $service_name == 'httpd' {
|
} elsif $service_name == 'httpd' {
|
||||||
include ::apache::params
|
include apache::params
|
||||||
service { 'mistral-api':
|
service { 'mistral-api':
|
||||||
ensure => 'stopped',
|
ensure => 'stopped',
|
||||||
name => $::mistral::params::api_service_name,
|
name => $::mistral::params::api_service_name,
|
||||||
|
|
|
@ -11,8 +11,8 @@ class mistral::client(
|
||||||
$package_ensure = 'present'
|
$package_ensure = 'present'
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include ::mistral::deps
|
include mistral::deps
|
||||||
include ::mistral::params
|
include mistral::params
|
||||||
|
|
||||||
package { 'python-mistralclient':
|
package { 'python-mistralclient':
|
||||||
ensure => $package_ensure,
|
ensure => $package_ensure,
|
||||||
|
|
|
@ -24,7 +24,7 @@ class mistral::config (
|
||||||
$mistral_config = {},
|
$mistral_config = {},
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include ::mistral::deps
|
include mistral::deps
|
||||||
|
|
||||||
validate_legacy(Hash, 'validate_hash', $mistral_config)
|
validate_legacy(Hash, 'validate_hash', $mistral_config)
|
||||||
|
|
||||||
|
|
|
@ -45,7 +45,7 @@ class mistral::cors (
|
||||||
$allow_headers = $::os_service_default,
|
$allow_headers = $::os_service_default,
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include ::mistral::deps
|
include mistral::deps
|
||||||
|
|
||||||
oslo::cors { 'mistral_config':
|
oslo::cors { 'mistral_config':
|
||||||
allowed_origin => $allowed_origin,
|
allowed_origin => $allowed_origin,
|
||||||
|
|
|
@ -28,8 +28,8 @@ class mistral::cron_trigger (
|
||||||
$execution_interval = $::os_service_default,
|
$execution_interval = $::os_service_default,
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include ::mistral::deps
|
include mistral::deps
|
||||||
include ::mistral::params
|
include mistral::params
|
||||||
|
|
||||||
mistral_config {
|
mistral_config {
|
||||||
'cron_trigger/enabled': value => $enabled;
|
'cron_trigger/enabled': value => $enabled;
|
||||||
|
|
|
@ -62,7 +62,7 @@ class mistral::db (
|
||||||
$database_idle_timeout = undef,
|
$database_idle_timeout = undef,
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include ::mistral::deps
|
include mistral::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 mistral::db::mysql(
|
||||||
$allowed_hosts = undef
|
$allowed_hosts = undef
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include ::mistral::deps
|
include mistral::deps
|
||||||
|
|
||||||
validate_legacy(String, 'validate_string', $password)
|
validate_legacy(String, 'validate_string', $password)
|
||||||
|
|
||||||
|
|
|
@ -32,7 +32,7 @@ class mistral::db::postgresql(
|
||||||
$privileges = 'ALL',
|
$privileges = 'ALL',
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include ::mistral::deps
|
include mistral::deps
|
||||||
|
|
||||||
::openstacklib::db::postgresql { 'mistral':
|
::openstacklib::db::postgresql { 'mistral':
|
||||||
password_hash => postgresql_password($user, $password),
|
password_hash => postgresql_password($user, $password),
|
||||||
|
|
|
@ -3,8 +3,8 @@
|
||||||
#
|
#
|
||||||
class mistral::db::sync {
|
class mistral::db::sync {
|
||||||
|
|
||||||
include ::mistral::deps
|
include mistral::deps
|
||||||
include ::mistral::params
|
include mistral::params
|
||||||
|
|
||||||
exec { 'mistral-db-sync':
|
exec { 'mistral-db-sync':
|
||||||
command => $::mistral::params::db_sync_command,
|
command => $::mistral::params::db_sync_command,
|
||||||
|
|
|
@ -59,8 +59,8 @@ class mistral::engine (
|
||||||
$older_than = $::os_service_default,
|
$older_than = $::os_service_default,
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include ::mistral::deps
|
include mistral::deps
|
||||||
include ::mistral::params
|
include mistral::params
|
||||||
|
|
||||||
package { 'mistral-engine':
|
package { 'mistral-engine':
|
||||||
ensure => $package_ensure,
|
ensure => $package_ensure,
|
||||||
|
|
|
@ -37,8 +37,8 @@ class mistral::event_engine (
|
||||||
$event_definitions_cfg_file = $::os_service_default,
|
$event_definitions_cfg_file = $::os_service_default,
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include ::mistral::deps
|
include mistral::deps
|
||||||
include ::mistral::params
|
include mistral::params
|
||||||
|
|
||||||
package { 'mistral-event-engine':
|
package { 'mistral-event-engine':
|
||||||
ensure => $package_ensure,
|
ensure => $package_ensure,
|
||||||
|
|
|
@ -37,8 +37,8 @@ class mistral::executor (
|
||||||
$version = $::os_service_default,
|
$version = $::os_service_default,
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include ::mistral::deps
|
include mistral::deps
|
||||||
include ::mistral::params
|
include mistral::params
|
||||||
|
|
||||||
package { 'mistral-executor':
|
package { 'mistral-executor':
|
||||||
ensure => $package_ensure,
|
ensure => $package_ensure,
|
||||||
|
|
|
@ -222,9 +222,9 @@ class mistral(
|
||||||
$first_heartbeat_timeout = $::os_service_default,
|
$first_heartbeat_timeout = $::os_service_default,
|
||||||
){
|
){
|
||||||
|
|
||||||
include ::mistral::deps
|
include mistral::deps
|
||||||
include ::mistral::params
|
include mistral::params
|
||||||
include ::mistral::db
|
include mistral::db
|
||||||
|
|
||||||
package { 'mistral-common':
|
package { 'mistral-common':
|
||||||
ensure => $package_ensure,
|
ensure => $package_ensure,
|
||||||
|
@ -275,6 +275,6 @@ class mistral(
|
||||||
}
|
}
|
||||||
|
|
||||||
if $sync_db {
|
if $sync_db {
|
||||||
include ::mistral::db::sync
|
include mistral::db::sync
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -81,7 +81,7 @@ class mistral::keystone::auth(
|
||||||
$service_description = 'OpenStack Workflow Service',
|
$service_description = 'OpenStack Workflow Service',
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include ::mistral::deps
|
include mistral::deps
|
||||||
|
|
||||||
validate_legacy(String, 'validate_string', $password)
|
validate_legacy(String, 'validate_string', $password)
|
||||||
|
|
||||||
|
|
|
@ -203,7 +203,7 @@ class mistral::keystone::authtoken(
|
||||||
$service_token_roles_required = $::os_service_default,
|
$service_token_roles_required = $::os_service_default,
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include ::mistral::deps
|
include mistral::deps
|
||||||
|
|
||||||
if is_service_default($password) {
|
if is_service_default($password) {
|
||||||
fail('Please set password for mistral service user')
|
fail('Please set password for mistral service user')
|
||||||
|
|
|
@ -120,7 +120,7 @@ class mistral::logging(
|
||||||
$log_date_format = $::os_service_default,
|
$log_date_format = $::os_service_default,
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include ::mistral::deps
|
include mistral::deps
|
||||||
|
|
||||||
oslo::log { 'mistral_config':
|
oslo::log { 'mistral_config':
|
||||||
use_syslog => $use_syslog,
|
use_syslog => $use_syslog,
|
||||||
|
|
|
@ -34,8 +34,8 @@ class mistral::notifier(
|
||||||
$notify_publishers = $::os_service_default,
|
$notify_publishers = $::os_service_default,
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include ::mistral::deps
|
include mistral::deps
|
||||||
include ::mistral::params
|
include mistral::params
|
||||||
|
|
||||||
mistral_config {
|
mistral_config {
|
||||||
'notifier/type': value => $type;
|
'notifier/type': value => $type;
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
# Parameters for puppet-mistral
|
# Parameters for puppet-mistral
|
||||||
#
|
#
|
||||||
class mistral::params {
|
class mistral::params {
|
||||||
include ::openstacklib::defaults
|
include openstacklib::defaults
|
||||||
$pyvers = $::openstacklib::defaults::pyvers
|
$pyvers = $::openstacklib::defaults::pyvers
|
||||||
|
|
||||||
$client_package = "python${pyvers}-mistralclient"
|
$client_package = "python${pyvers}-mistralclient"
|
||||||
|
|
|
@ -28,8 +28,8 @@ class mistral::policy (
|
||||||
$policy_path = '/etc/mistral/policy.json',
|
$policy_path = '/etc/mistral/policy.json',
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include ::mistral::deps
|
include mistral::deps
|
||||||
include ::mistral::params
|
include mistral::params
|
||||||
|
|
||||||
validate_legacy(Hash, 'validate_hash', $policies)
|
validate_legacy(Hash, 'validate_hash', $policies)
|
||||||
|
|
||||||
|
|
|
@ -123,12 +123,12 @@ class mistral::wsgi::apache (
|
||||||
$custom_wsgi_process_options = {},
|
$custom_wsgi_process_options = {},
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include ::mistral::deps
|
include mistral::deps
|
||||||
include ::mistral::params
|
include mistral::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
|
||||||
}
|
}
|
||||||
|
|
||||||
# The httpd package is untagged, but needs to have ordering enforced,
|
# The httpd package is untagged, but needs to have ordering enforced,
|
||||||
|
|
|
@ -6,12 +6,12 @@ describe 'basic mistral' 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
|
||||||
include ::openstack_integration::mistral
|
include openstack_integration::mistral
|
||||||
EOS
|
EOS
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -15,7 +15,7 @@ describe 'mistral::api' do
|
||||||
end
|
end
|
||||||
|
|
||||||
let :pre_condition do
|
let :pre_condition do
|
||||||
"class { '::mistral::keystone::authtoken':
|
"class { 'mistral::keystone::authtoken':
|
||||||
password => 'foo',
|
password => 'foo',
|
||||||
}"
|
}"
|
||||||
end
|
end
|
||||||
|
@ -103,10 +103,10 @@ describe 'mistral::api' do
|
||||||
end
|
end
|
||||||
|
|
||||||
let :pre_condition do
|
let :pre_condition do
|
||||||
"include ::apache
|
"include apache
|
||||||
include ::mistral::db
|
include mistral::db
|
||||||
class { '::mistral': }
|
class { 'mistral': }
|
||||||
class { '::mistral::keystone::authtoken':
|
class { 'mistral::keystone::authtoken':
|
||||||
password => 'foo',
|
password => 'foo',
|
||||||
}"
|
}"
|
||||||
end
|
end
|
||||||
|
|
|
@ -9,7 +9,7 @@ describe 'mistral' do
|
||||||
end
|
end
|
||||||
|
|
||||||
let :pre_condition do
|
let :pre_condition do
|
||||||
"class { '::mistral::keystone::authtoken':
|
"class { 'mistral::keystone::authtoken':
|
||||||
password => 'foo',
|
password => 'foo',
|
||||||
}"
|
}"
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue