Use relative names to include classes
... to avoid lint errors by relative_classname_inclusion, which was re-enabled recently[1]. [1] https://review.opendev.org/#/c/740023/ Change-Id: Ibb80b8b0f4075c00ceb306bcf54bb87df58165af
This commit is contained in:
parent
4cca6ed283
commit
07e0aca242
@ -264,7 +264,7 @@ class tripleo::network::contrail::analytics(
|
||||
}
|
||||
}
|
||||
if $step >= 3 {
|
||||
class {'::contrail::analytics':
|
||||
class {'contrail::analytics':
|
||||
alarm_gen_config => {
|
||||
'DEFAULTS' => {
|
||||
'host_ip' => $host_ip,
|
||||
@ -367,7 +367,7 @@ class tripleo::network::contrail::analytics(
|
||||
}
|
||||
}
|
||||
if $step >= 5 {
|
||||
class {'::contrail::analytics::provision_analytics':
|
||||
class {'contrail::analytics::provision_analytics':
|
||||
api_address => $api_server,
|
||||
api_port => $api_port,
|
||||
analytics_node_address => $host_ip,
|
||||
|
@ -160,7 +160,7 @@ class tripleo::network::contrail::analyticsdatabase(
|
||||
}
|
||||
}
|
||||
if $step == 2 {
|
||||
class {'::contrail::analyticsdatabase':
|
||||
class {'contrail::analyticsdatabase':
|
||||
analyticsdatabase_params => {
|
||||
'auth_host' => $auth_host,
|
||||
'api_server' => $api_server,
|
||||
@ -188,7 +188,7 @@ class tripleo::network::contrail::analyticsdatabase(
|
||||
}
|
||||
}
|
||||
if $step >= 5 {
|
||||
class {'::contrail::database::provision_database':
|
||||
class {'contrail::database::provision_database':
|
||||
api_address => $api_server,
|
||||
api_port => $api_port,
|
||||
database_node_address => $host_ip,
|
||||
|
@ -308,7 +308,7 @@ class tripleo::network::contrail::config(
|
||||
}
|
||||
}
|
||||
if $step >= 3 {
|
||||
class {'::contrail::config':
|
||||
class {'contrail::config':
|
||||
api_config => {
|
||||
'DEFAULTS' => {
|
||||
'aaa_mode' => $aaa_mode,
|
||||
@ -393,7 +393,7 @@ class tripleo::network::contrail::config(
|
||||
}
|
||||
}
|
||||
if $step >= 5 {
|
||||
class {'::contrail::config::provision_config':
|
||||
class {'contrail::config::provision_config':
|
||||
api_address => $api_server,
|
||||
api_port => $api_port,
|
||||
config_node_address => $host_ip,
|
||||
@ -404,7 +404,7 @@ class tripleo::network::contrail::config(
|
||||
openstack_vip => $auth_host,
|
||||
}
|
||||
if $config_hostnames[0] == $::hostname {
|
||||
class {'::contrail::config::provision_linklocal':
|
||||
class {'contrail::config::provision_linklocal':
|
||||
api_address => $api_server,
|
||||
api_port => $api_port,
|
||||
ipfabric_service_ip => $api_server,
|
||||
|
@ -157,7 +157,7 @@ class tripleo::network::contrail::control(
|
||||
$dns_ifmap_password = "${ifmap_username}.dns"
|
||||
|
||||
if $step >= 3 {
|
||||
class {'::contrail::control':
|
||||
class {'contrail::control':
|
||||
secret => $secret,
|
||||
manage_named => $manage_named,
|
||||
control_config => {
|
||||
@ -196,7 +196,7 @@ class tripleo::network::contrail::control(
|
||||
}
|
||||
}
|
||||
if $step >= 5 {
|
||||
class {'::contrail::control::provision_control':
|
||||
class {'contrail::control::provision_control':
|
||||
api_address => $api_server,
|
||||
api_port => $api_port,
|
||||
control_node_address => $host_ip,
|
||||
|
@ -124,7 +124,7 @@ class tripleo::network::contrail::database(
|
||||
)
|
||||
{
|
||||
if $step == 2 {
|
||||
class {'::contrail::database':
|
||||
class {'contrail::database':
|
||||
database_params => {
|
||||
'auth_host' => $auth_host,
|
||||
'api_server' => $api_server,
|
||||
@ -152,7 +152,7 @@ class tripleo::network::contrail::database(
|
||||
}
|
||||
}
|
||||
if $step >= 5 {
|
||||
class {'::contrail::database::provision_database':
|
||||
class {'contrail::database::provision_database':
|
||||
api_address => $api_server,
|
||||
api_port => $api_port,
|
||||
database_node_address => $host_ip,
|
||||
|
@ -76,7 +76,7 @@ class tripleo::network::contrail::heat(
|
||||
)
|
||||
{
|
||||
|
||||
class {'::contrail::heat':
|
||||
class {'contrail::heat':
|
||||
heat_config => {
|
||||
'clients_contrail' => {
|
||||
'api_base_url' => '/',
|
||||
|
@ -79,13 +79,13 @@ class tripleo::network::contrail::provision(
|
||||
)
|
||||
{
|
||||
if $step >= 5 {
|
||||
class {'::contrail::control::provision_control':
|
||||
class {'contrail::control::provision_control':
|
||||
api_address => $api_server,
|
||||
keystone_admin_user => $admin_user,
|
||||
keystone_admin_password => $admin_password,
|
||||
keystone_admin_tenant_name => $admin_tenant_name,
|
||||
}
|
||||
class {'::contrail::control::provision_linklocal':
|
||||
class {'contrail::control::provision_linklocal':
|
||||
api_address => $api_server,
|
||||
keystone_admin_user => $admin_user,
|
||||
keystone_admin_password => $admin_password,
|
||||
|
@ -319,7 +319,7 @@ class tripleo::network::contrail::vrouter (
|
||||
},
|
||||
}
|
||||
}
|
||||
class {'::contrail::vrouter':
|
||||
class {'contrail::vrouter':
|
||||
discovery_ip => $disc_server_ip,
|
||||
gateway => $gateway,
|
||||
host_ip => $host_ip,
|
||||
@ -341,7 +341,7 @@ class tripleo::network::contrail::vrouter (
|
||||
vnc_api_lib_config => $vnc_api_lib_config,
|
||||
}
|
||||
if $step >= 5 {
|
||||
class {'::contrail::vrouter::provision_vrouter':
|
||||
class {'contrail::vrouter::provision_vrouter':
|
||||
api_address => $api_server,
|
||||
api_port => $api_port,
|
||||
host_ip => $host_ip,
|
||||
|
@ -112,7 +112,7 @@ class tripleo::network::contrail::webui(
|
||||
$redis_ip = hiera('contrail::webui::redis_ip'),
|
||||
)
|
||||
{
|
||||
class {'::contrail::webui':
|
||||
class {'contrail::webui':
|
||||
admin_user => $admin_user,
|
||||
admin_password => $admin_password,
|
||||
admin_token => $admin_token,
|
||||
|
@ -103,7 +103,7 @@ class tripleo::profile::base::ceilometer::agent::notification (
|
||||
$real_event_pipeline_publishers = $other_event_publishers
|
||||
}
|
||||
|
||||
class { '::ceilometer::agent::notification':
|
||||
class { 'ceilometer::agent::notification':
|
||||
event_pipeline_publishers => $real_event_pipeline_publishers,
|
||||
pipeline_publishers => $real_pipeline_publishers,
|
||||
}
|
||||
|
@ -80,7 +80,7 @@ class tripleo::profile::base::etcd (
|
||||
if $step >= 2 {
|
||||
$bind_ip_normalized = normalize_ip_for_uri($bind_ip)
|
||||
|
||||
class {'::etcd':
|
||||
class {'etcd':
|
||||
listen_client_urls => "${protocol}://${bind_ip_normalized}:${client_port}",
|
||||
advertise_client_urls => "${protocol}://${bind_ip_normalized}:${client_port}",
|
||||
listen_peer_urls => "${protocol}://${bind_ip_normalized}:${peer_port}",
|
||||
|
@ -54,7 +54,7 @@ class tripleo::profile::base::haproxy (
|
||||
) {
|
||||
if $step >= 1 {
|
||||
if $enable_load_balancer {
|
||||
class {'::tripleo::haproxy':
|
||||
class {'tripleo::haproxy':
|
||||
internal_certificates_specs => $certificates_specs,
|
||||
manage_firewall => $manage_firewall,
|
||||
}
|
||||
|
@ -261,7 +261,7 @@ class tripleo::profile::base::metrics::collectd (
|
||||
$enable_sensubility = false,
|
||||
) {
|
||||
if $step >= 3 {
|
||||
class {'::collectd':
|
||||
class {'collectd':
|
||||
manage_repo => $collectd_manage_repo
|
||||
}
|
||||
|
||||
|
@ -100,7 +100,7 @@ class tripleo::profile::base::mistral (
|
||||
if $step >= 4 or ($step >= 3 and $sync_db) {
|
||||
$oslomsg_rpc_use_ssl_real = sprintf('%s', bool2num(str2bool($oslomsg_rpc_use_ssl)))
|
||||
$oslomsg_notify_use_ssl_real = sprintf('%s', bool2num(str2bool($oslomsg_notify_use_ssl)))
|
||||
class { '::mistral':
|
||||
class { 'mistral':
|
||||
default_transport_url => os_transport_url({
|
||||
'transport' => $oslomsg_rpc_proto,
|
||||
'hosts' => $oslomsg_rpc_hosts,
|
||||
|
@ -31,7 +31,7 @@ class tripleo::profile::base::neutron::opencontrail::vrouter (
|
||||
include contrail::vrouter
|
||||
# NOTE: it's not possible to use this class without a functional
|
||||
# contrail controller up and running
|
||||
#class {'::contrail::vrouter::provision_vrouter':
|
||||
#class {'contrail::vrouter::provision_vrouter':
|
||||
# require => Class['contrail::vrouter'],
|
||||
#}
|
||||
|
||||
|
@ -100,7 +100,7 @@ class tripleo::profile::base::zaqar (
|
||||
if $messaging_store == 'swift' {
|
||||
include zaqar::messaging::swift
|
||||
} elsif $messaging_store == 'redis' {
|
||||
class {'::zaqar::messaging::redis':
|
||||
class {'zaqar::messaging::redis':
|
||||
uri => join(['redis://:', $zaqar_redis_password, '@', normalize_ip_for_uri($redis_vip), ':6379/']),
|
||||
}
|
||||
} else {
|
||||
|
@ -57,7 +57,7 @@ class tripleo::profile::pacemaker::haproxy (
|
||||
$step = Integer(hiera('step')),
|
||||
$pcs_tries = hiera('pcs_tries', 20),
|
||||
) {
|
||||
class {'::tripleo::profile::base::haproxy':
|
||||
class {'tripleo::profile::base::haproxy':
|
||||
manage_firewall => $manage_firewall,
|
||||
}
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user