Convert all class usage to relative names

Change-Id: I7bd08ef57382a561d15d82b45e9acaf4f7e46e99
This commit is contained in:
Tobias Urdin 2019-12-08 23:11:27 +01:00
parent 237461c87b
commit ddb35db3cb
17 changed files with 22 additions and 22 deletions

View File

@ -1 +1 @@
include ::monasca::apiserver
include monasca::apiserver

View File

@ -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

View File

@ -1 +1 @@
include ::monasca::storm
include monasca::storm

View File

@ -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"

View File

@ -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')

View File

@ -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}"

View File

@ -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

View File

@ -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'

View File

@ -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

View File

@ -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

View File

@ -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)

View File

@ -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}"

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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',

View File

@ -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