diff --git a/examples/apiserver.pp b/examples/apiserver.pp index 0a6fb0e..4c27699 100644 --- a/examples/apiserver.pp +++ b/examples/apiserver.pp @@ -1 +1 @@ -include ::monasca::apiserver +include monasca::apiserver diff --git a/examples/init.pp b/examples/init.pp index fd9ce71..c2153d4 100644 --- a/examples/init.pp +++ b/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 ::monasca +include monasca diff --git a/examples/storm.pp b/examples/storm.pp index d2c15a0..c955ddc 100644 --- a/examples/storm.pp +++ b/examples/storm.pp @@ -1 +1 @@ -include ::monasca::storm +include monasca::storm diff --git a/manifests/agent.pp b/manifests/agent.pp index 1a5997d..fd55414 100644 --- a/manifests/agent.pp +++ b/manifests/agent.pp @@ -159,8 +159,8 @@ class monasca::agent( $python_dep_ensure = 'present', $pip_install_args = '', ) { - include ::monasca - include ::monasca::params + include monasca + include monasca::params $agent_dir = "${::monasca::monasca_dir}/agent" $additional_checksd = "${agent_dir}/checks.d" diff --git a/manifests/alarmdefs.pp b/manifests/alarmdefs.pp index 5a4d916..8e3b90e 100644 --- a/manifests/alarmdefs.pp +++ b/manifests/alarmdefs.pp @@ -54,7 +54,7 @@ class monasca::alarmdefs( $python_dep_ensure = undef, ) { - include ::monasca::params + include monasca::params if $install_python_deps { warning('monasca::alarmdefs::install_python_deps is deprecated and has no effect') diff --git a/manifests/api.pp b/manifests/api.pp index 0d24a31..648f8ae 100644 --- a/manifests/api.pp +++ b/manifests/api.pp @@ -143,8 +143,8 @@ class monasca::api ( $vertica_db_hint = '', $zookeeper_servers = undef, ) { - include ::monasca - include ::monasca::params + include monasca + include monasca::params $api_fetch_url = "http://${blobmirror}/repos/monasca/monasca_api" $latest_api_deb = "/tmp/${mon_api_deb}" diff --git a/manifests/db/mysql.pp b/manifests/db/mysql.pp index 7f58ef0..50df713 100644 --- a/manifests/db/mysql.pp +++ b/manifests/db/mysql.pp @@ -3,7 +3,7 @@ # for configuration of thresholds, alarms, etc. # class monasca::db::mysql { - include ::monasca::params + include monasca::params $sql_host = $::monasca::params::sql_host $sql_user = $::monasca::params::sql_user diff --git a/manifests/influxdb/bootstrap.pp b/manifests/influxdb/bootstrap.pp index 1c1595c..6c2c259 100644 --- a/manifests/influxdb/bootstrap.pp +++ b/manifests/influxdb/bootstrap.pp @@ -35,7 +35,7 @@ class monasca::influxdb::bootstrap( $influxdb_retention_replication = 1, ) { - include ::monasca::params + include monasca::params $influxdb_dbuser_password = $::monasca::params::api_db_password $script = 'bootstrap-influxdb.sh' diff --git a/manifests/keystone/auth.pp b/manifests/keystone/auth.pp index 8071860..2369ecd 100644 --- a/manifests/keystone/auth.pp +++ b/manifests/keystone/auth.pp @@ -151,7 +151,7 @@ class monasca::keystone::auth ( $user_roles_admin = undef, $user_roles_user = undef, ) { - include ::monasca::params + include monasca::params $admin_name = $::monasca::params::admin_name $agent_name = $::monasca::params::agent_name diff --git a/manifests/notification.pp b/manifests/notification.pp index 1c88dca..d4c9b36 100644 --- a/manifests/notification.pp +++ b/manifests/notification.pp @@ -103,7 +103,7 @@ class monasca::notification( $zookeeper_servers = 'localhost:2181', ) { - include ::monasca::params + include monasca::params # variables for the template $sql_host = $::monasca::params::sql_host diff --git a/manifests/params.pp b/manifests/params.pp index cba2b94..6defb05 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -94,7 +94,7 @@ class monasca::params( } ) { - include ::openstacklib::defaults + include openstacklib::defaults validate_legacy(String, 'validate_string', $admin_password) validate_legacy(String, 'validate_string', $admin_project_name) diff --git a/manifests/persister.pp b/manifests/persister.pp index 39e02b3..e103b58 100644 --- a/manifests/persister.pp +++ b/manifests/persister.pp @@ -50,8 +50,8 @@ class monasca::persister ( $pers_user = 'persister', $zookeeper_servers = undef, ) { - include ::monasca - include ::monasca::params + include monasca + include monasca::params $pers_fetch_url = "http://${blobmirror}/repos/monasca/monasca_persister" $latest_pers_deb = "/tmp/${mon_pers_deb}" diff --git a/manifests/persister/config.pp b/manifests/persister/config.pp index 733f66a..a0a58c1 100644 --- a/manifests/persister/config.pp +++ b/manifests/persister/config.pp @@ -61,7 +61,7 @@ define monasca::persister::config ( $retention_policy = 'raw', $zookeeper_servers = $monasca::persister::zookeeper_servers, ) { - include ::monasca::params + include monasca::params $persister_config = deep_merge($monasca::params::persister_config_defaults, $config) $persister_service_name = $name diff --git a/manifests/thresh.pp b/manifests/thresh.pp index 1477bc0..73cf747 100644 --- a/manifests/thresh.pp +++ b/manifests/thresh.pp @@ -23,8 +23,8 @@ class monasca::thresh ( $mon_thresh_deb = undef, $zookeeper_servers = undef, ) { - include ::monasca - include ::monasca::params + include monasca + include monasca::params # variables for the template $sql_host = $::monasca::params::sql_host diff --git a/manifests/vertica/config.pp b/manifests/vertica/config.pp index a919596..1c25f9a 100644 --- a/manifests/vertica/config.pp +++ b/manifests/vertica/config.pp @@ -107,7 +107,7 @@ class monasca::vertica::config ( $virtual_env = '/var/lib/vertica', ) { - include ::monasca::params + include monasca::params $api_db_user = $::monasca::params::api_db_user $api_db_password = $::monasca::params::api_db_password diff --git a/spec/acceptance/monasca_alarmdefs_spec.rb b/spec/acceptance/monasca_alarmdefs_spec.rb index efbc42d..ef37bf7 100644 --- a/spec/acceptance/monasca_alarmdefs_spec.rb +++ b/spec/acceptance/monasca_alarmdefs_spec.rb @@ -6,7 +6,7 @@ describe 'alarmdefs class' do it 'we expect a failure for now' do tmpdir = default.tmpdir('alarmdefs') pp = <<-EOS - class { '::monasca::alarmdefs': + class { 'monasca::alarmdefs': admin_password => 'foo', api_server_url => 'http://127.0.0.1:8070', auth_url => 'http://127.0.0.1:5000', diff --git a/spec/classes/monasca_alarmdefs_spec.rb b/spec/classes/monasca_alarmdefs_spec.rb index 275fdba..65984bb 100644 --- a/spec/classes/monasca_alarmdefs_spec.rb +++ b/spec/classes/monasca_alarmdefs_spec.rb @@ -2,8 +2,8 @@ require 'spec_helper' describe 'monasca::alarmdefs' do let :pre_condition do - "include ::monasca - include ::monasca::api" + "include monasca + include monasca::api" end shared_examples 'monasca::alarmdefs' do