From 5e6151be978144ea108b93084241ae669dfe3807 Mon Sep 17 00:00:00 2001 From: Tobias Urdin Date: Sun, 8 Dec 2019 23:08:32 +0100 Subject: [PATCH] Convert all class usage to relative names Change-Id: Iea5de7192d01739024d17e9813fe591f230aaf4d --- README.md | 14 +++++++------- examples/ironic.pp | 18 +++++++++--------- manifests/api.pp | 10 +++++----- manifests/api/authtoken.pp | 2 +- manifests/bifrost.pp | 2 +- manifests/client.pp | 4 ++-- manifests/conductor.pp | 8 ++++---- manifests/config.pp | 2 +- manifests/cors.pp | 2 +- manifests/db.pp | 2 +- manifests/db/mysql.pp | 2 +- manifests/db/online_data_migrations.pp | 4 ++-- manifests/db/postgresql.pp | 2 +- manifests/db/sync.pp | 4 ++-- manifests/drivers/agent.pp | 2 +- manifests/drivers/ansible.pp | 4 ++-- manifests/drivers/drac.pp | 4 ++-- manifests/drivers/hardware_interface.pp | 2 +- manifests/drivers/ilo.pp | 4 ++-- manifests/drivers/inspector.pp | 2 +- manifests/drivers/ipmi.pp | 2 +- manifests/drivers/pxe.pp | 4 ++-- manifests/drivers/redfish.pp | 4 ++-- manifests/drivers/staging.pp | 4 ++-- manifests/init.pp | 14 +++++++------- manifests/inspector.pp | 12 ++++++------ manifests/inspector/authtoken.pp | 2 +- manifests/inspector/client.pp | 4 ++-- manifests/inspector/cors.pp | 2 +- manifests/inspector/db.pp | 2 +- manifests/inspector/db/sync.pp | 4 ++-- manifests/inspector/logging.pp | 2 +- manifests/inspector/pxe_filter.pp | 2 +- manifests/inspector/pxe_filter/dnsmasq.pp | 4 ++-- manifests/keystone/auth.pp | 2 +- manifests/keystone/auth_inspector.pp | 2 +- manifests/logging.pp | 2 +- manifests/params.pp | 2 +- manifests/policy.pp | 4 ++-- manifests/pxe.pp | 8 ++++---- manifests/pxe/common.pp | 2 +- manifests/pxe/tftpboot_file.pp | 2 +- manifests/service_catalog.pp | 2 +- manifests/wsgi/apache.pp | 10 +++++----- spec/acceptance/ironic_wsgi_apache_spec.rb | 12 ++++++------ spec/classes/ironic_api_spec.rb | 10 +++++----- 46 files changed, 107 insertions(+), 107 deletions(-) diff --git a/README.md b/README.md index cd9a3f4e..9217dc9a 100644 --- a/README.md +++ b/README.md @@ -46,28 +46,28 @@ To utilize the ironic module's functionality you will need to declare multiple r ```puppet # enable Ironic resources -class { '::ironic': +class { 'ironic': default_transport_url => 'rabbit://ironic:an_even_bigger_secret@127.0.0.1:5672/ironic', database_connection => 'mysql://ironic:a_big_secret@127.0.0.1/ironic?charset=utf8', } -class { '::ironic::db::mysql': +class { 'ironic::db::mysql': password => 'a_big_secret', } -class { '::ironic::keystone::auth': +class { 'ironic::keystone::auth': password => 'a_big_secret', } -class { '::ironic::client': } +class { 'ironic::client': } -class { '::ironic::conductor': } +class { 'ironic::conductor': } -class { '::ironic::api': +class { 'ironic::api': admin_password => 'a_big_secret', } -class { '::ironic::drivers::ipmi': } +class { 'ironic::drivers::ipmi': } # alternatively, you can deploy Ironic with Bifrost. It's a collection of Ansible playbooks to configure # and install Ironic in a stand-alone fashion (for more information visit https://docs.openstack.org/bifrost/latest/) diff --git a/examples/ironic.pp b/examples/ironic.pp index 84c12859..7a00e0d6 100644 --- a/examples/ironic.pp +++ b/examples/ironic.pp @@ -60,15 +60,15 @@ $baremetal_json_hosts = ' node 'db' { - class { '::mysql::server': + class { 'mysql::server': config_hash => { 'bind_address' => '0.0.0.0', }, } - class { '::mysql::ruby': } + class { 'mysql::ruby': } - class { '::ironic::db::mysql': + class { 'ironic::db::mysql': password => $db_password, dbname => $db_name, user => $db_username, @@ -80,7 +80,7 @@ node 'db' { node 'controller' { - class { '::ironic': + class { 'ironic': db_password => $db_password, db_name => $db_name, db_user => $db_username, @@ -96,13 +96,13 @@ node 'controller' { glance_api_servers => $glance_api_servers, } - class { '::ironic::api': } + class { 'ironic::api': } - class { '::ironic::conductor': } + class { 'ironic::conductor': } - class { '::ironic::drivers::ipmi': } + class { 'ironic::drivers::ipmi': } - class { '::ironic::drivers::pxe': + class { 'ironic::drivers::pxe': deploy_kernel => $deploy_kernel, deploy_ramdisk => $deploy_ramdisk, } @@ -111,7 +111,7 @@ node 'controller' { node 'bifrost-controller' { - class { '::ironic::bifrost': + class { 'ironic::bifrost': network_interface => 'eth1', ironic_db_password => 'changeme', mysql_password => 'changemetoo', diff --git a/manifests/api.pp b/manifests/api.pp index 2ae9e45a..68870dbc 100644 --- a/manifests/api.pp +++ b/manifests/api.pp @@ -82,10 +82,10 @@ class ironic::api ( $max_request_body_size = $::os_service_default, ) inherits ironic::params { - include ::ironic::deps - include ::ironic::params - include ::ironic::policy - include ::ironic::api::authtoken + include ironic::deps + include ironic::params + include ironic::policy + include ironic::api::authtoken # Configure ironic.conf ironic_config { @@ -122,7 +122,7 @@ class ironic::api ( } Keystone_endpoint<||> -> Service['ironic-api'] } elsif $service_name == 'httpd' { - include ::apache::params + include apache::params service { 'ironic-api': ensure => 'stopped', name => $::ironic::params::api_service, diff --git a/manifests/api/authtoken.pp b/manifests/api/authtoken.pp index 557bb4ac..2e21b236 100644 --- a/manifests/api/authtoken.pp +++ b/manifests/api/authtoken.pp @@ -215,7 +215,7 @@ class ironic::api::authtoken( $service_token_roles_required = $::os_service_default, ) { - include ::ironic::deps + include ironic::deps if is_service_default($password) { fail('Please set password for Ironic API service user') diff --git a/manifests/bifrost.pp b/manifests/bifrost.pp index adb99573..7361d971 100644 --- a/manifests/bifrost.pp +++ b/manifests/bifrost.pp @@ -190,7 +190,7 @@ class ironic::bifrost ( $ipmi_bridging = 'no', ) { - include ::ironic::deps + include ironic::deps git { $git_dest_repo_folder: ensure => $ensure, diff --git a/manifests/client.pp b/manifests/client.pp index c47ea095..d733b57a 100644 --- a/manifests/client.pp +++ b/manifests/client.pp @@ -30,8 +30,8 @@ class ironic::client ( $package_ensure = present ) { - include ::ironic::deps - include ::ironic::params + include ironic::deps + include ironic::params package { 'python-ironicclient': ensure => $package_ensure, diff --git a/manifests/conductor.pp b/manifests/conductor.pp index 46233cd9..926b2423 100644 --- a/manifests/conductor.pp +++ b/manifests/conductor.pp @@ -241,11 +241,11 @@ class ironic::conductor ( $allow_provisioning_in_maintenance = $::os_service_default, ) { - include ::ironic::deps - include ::ironic::params + include ironic::deps + include ironic::params # For backward compatibility - include ::ironic::glance + include ironic::glance if ($cleaning_network_name and !is_service_default($cleaning_network)) { fail('cleaning_network_name and cleaning_network can not be specified at the same time.') @@ -267,7 +267,7 @@ class ironic::conductor ( # NOTE(dtantsur): all in-tree drivers are IPA-based, so it won't hurt # including its manifest (which only contains configuration options) - include ::ironic::drivers::agent + include ironic::drivers::agent # On Ubuntu, ipmitool dependency is missing and ironic-conductor fails to start. # https://bugs.launchpad.net/cloud-archive/+bug/1572800 diff --git a/manifests/config.pp b/manifests/config.pp index 677c9d29..b55b7c5c 100644 --- a/manifests/config.pp +++ b/manifests/config.pp @@ -28,7 +28,7 @@ class ironic::config ( $ironic_api_paste_ini = {}, ) { - include ::ironic::deps + include ironic::deps validate_legacy(Hash, 'validate_hash', $ironic_config) validate_legacy(Hash, 'validate_hash', $ironic_api_paste_ini) diff --git a/manifests/cors.pp b/manifests/cors.pp index 8fa855ca..f331538c 100644 --- a/manifests/cors.pp +++ b/manifests/cors.pp @@ -45,7 +45,7 @@ class ironic::cors ( $allow_headers = $::os_service_default, ) { - include ::ironic::deps + include ironic::deps oslo::cors { 'ironic_config': allowed_origin => $allowed_origin, diff --git a/manifests/db.pp b/manifests/db.pp index eb71c1e6..07fddec2 100644 --- a/manifests/db.pp +++ b/manifests/db.pp @@ -62,7 +62,7 @@ class ironic::db ( $database_idle_timeout = undef, ) { - include ::ironic::deps + include ironic::deps if $database_idle_timeout { warning('The database_idle_timeout parameter is deprecated. Please use \ diff --git a/manifests/db/mysql.pp b/manifests/db/mysql.pp index 4f410446..a8329d75 100644 --- a/manifests/db/mysql.pp +++ b/manifests/db/mysql.pp @@ -54,7 +54,7 @@ class ironic::db::mysql ( $collate = 'utf8_general_ci', ) { - include ::ironic::deps + include ironic::deps ::openstacklib::db::mysql { 'ironic': user => $user, diff --git a/manifests/db/online_data_migrations.pp b/manifests/db/online_data_migrations.pp index 7b6542ad..554cb14b 100644 --- a/manifests/db/online_data_migrations.pp +++ b/manifests/db/online_data_migrations.pp @@ -19,8 +19,8 @@ class ironic::db::online_data_migrations( $migration_params = undef, ) { - include ::ironic::deps - include ::ironic::params + include ironic::deps + include ironic::params exec { 'ironic-db-online-data-migrations': command => "${::ironic::params::dbsync_command} ${extra_params} online_data_migrations ${migration_params}", diff --git a/manifests/db/postgresql.pp b/manifests/db/postgresql.pp index ce929d83..bcd84606 100644 --- a/manifests/db/postgresql.pp +++ b/manifests/db/postgresql.pp @@ -32,7 +32,7 @@ class ironic::db::postgresql( $privileges = 'ALL', ) { - include ::ironic::deps + include ironic::deps ::openstacklib::db::postgresql { 'ironic': password_hash => postgresql_password($user, $password), diff --git a/manifests/db/sync.pp b/manifests/db/sync.pp index 14b96695..436111a9 100644 --- a/manifests/db/sync.pp +++ b/manifests/db/sync.pp @@ -12,8 +12,8 @@ class ironic::db::sync( $extra_params = undef, ) { - include ::ironic::deps - include ::ironic::params + include ironic::deps + include ironic::params # NOTE(dtantsur): previous ironic-dbsync was run as root. it will fail to run # as "ironic" user, if there is an old log file owned by root. Let's fix it. diff --git a/manifests/drivers/agent.pp b/manifests/drivers/agent.pp index f6a5ad86..a5c393d6 100644 --- a/manifests/drivers/agent.pp +++ b/manifests/drivers/agent.pp @@ -73,7 +73,7 @@ class ironic::drivers::agent ( $deploy_logs_swift_days_to_expire = $::os_service_default, ) { - include ::ironic::deps + include ironic::deps # Configure ironic.conf ironic_config { diff --git a/manifests/drivers/ansible.pp b/manifests/drivers/ansible.pp index f5e0c460..d370b833 100644 --- a/manifests/drivers/ansible.pp +++ b/manifests/drivers/ansible.pp @@ -81,8 +81,8 @@ class ironic::drivers::ansible ( $default_python_interpreter = $::os_service_default, ) { - include ::ironic::deps - include ::ironic::params + include ironic::deps + include ironic::params # Configure ironic.conf ironic_config { diff --git a/manifests/drivers/drac.pp b/manifests/drivers/drac.pp index 3f3168fa..6b09694f 100644 --- a/manifests/drivers/drac.pp +++ b/manifests/drivers/drac.pp @@ -23,8 +23,8 @@ class ironic::drivers::drac ( $package_ensure = 'present', ) { - include ::ironic::deps - include ::ironic::params + include ironic::deps + include ironic::params ensure_packages('python-dracclient', { diff --git a/manifests/drivers/hardware_interface.pp b/manifests/drivers/hardware_interface.pp index c976ff68..9d4b84e9 100644 --- a/manifests/drivers/hardware_interface.pp +++ b/manifests/drivers/hardware_interface.pp @@ -35,7 +35,7 @@ define ironic::drivers::hardware_interface ( $default = $::os_service_default, ) { - include ::ironic::deps + include ironic::deps if !is_service_default($enabled_list) and !empty($enabled_list){ validate_legacy(Array, 'validate_array', $enabled_list) diff --git a/manifests/drivers/ilo.pp b/manifests/drivers/ilo.pp index 26e519ff..e5d9d484 100644 --- a/manifests/drivers/ilo.pp +++ b/manifests/drivers/ilo.pp @@ -46,8 +46,8 @@ class ironic::drivers::ilo ( $package_ensure = 'present', ) { - include ::ironic::deps - include ::ironic::params + include ironic::deps + include ironic::params # Configure ironic.conf ironic_config { diff --git a/manifests/drivers/inspector.pp b/manifests/drivers/inspector.pp index 882fb5f8..61d75685 100644 --- a/manifests/drivers/inspector.pp +++ b/manifests/drivers/inspector.pp @@ -80,7 +80,7 @@ class ironic::drivers::inspector ( $service_url = undef, ) { - include ::ironic::deps + include ironic::deps if $service_url { warning("The ironic::drivers::inspector::service_url parameter is deprecated and \ diff --git a/manifests/drivers/ipmi.pp b/manifests/drivers/ipmi.pp index a4566df4..bba17671 100644 --- a/manifests/drivers/ipmi.pp +++ b/manifests/drivers/ipmi.pp @@ -34,7 +34,7 @@ class ironic::drivers::ipmi ( $min_command_interval = $::os_service_default, ) { - include ::ironic::deps + include ironic::deps # Configure ironic.conf ironic_config { diff --git a/manifests/drivers/pxe.pp b/manifests/drivers/pxe.pp index 6e4a0c62..39456992 100644 --- a/manifests/drivers/pxe.pp +++ b/manifests/drivers/pxe.pp @@ -112,8 +112,8 @@ class ironic::drivers::pxe ( $ip_version = $::os_service_default, ) { - include ::ironic::deps - include ::ironic::pxe::common + include ironic::deps + include ironic::pxe::common $tftp_root_real = pick($::ironic::pxe::common::tftp_root, $tftp_root) $ipxe_timeout_real = pick($::ironic::pxe::common::ipxe_timeout, $ipxe_timeout) diff --git a/manifests/drivers/redfish.pp b/manifests/drivers/redfish.pp index 11978946..c1fa97dc 100644 --- a/manifests/drivers/redfish.pp +++ b/manifests/drivers/redfish.pp @@ -34,8 +34,8 @@ class ironic::drivers::redfish ( $connection_retry_interval = $::os_service_default, ) { - include ::ironic::deps - include ::ironic::params + include ironic::deps + include ironic::params ironic_config { 'redfish/connection_attempts': value => $connection_attempts; diff --git a/manifests/drivers/staging.pp b/manifests/drivers/staging.pp index b8abbc0d..2f66aadd 100644 --- a/manifests/drivers/staging.pp +++ b/manifests/drivers/staging.pp @@ -12,8 +12,8 @@ class ironic::drivers::staging ( $package_ensure = present ) { - include ::ironic::deps - include ::ironic::params + include ironic::deps + include ironic::params package { 'ironic-staging-drivers': ensure => $package_ensure, diff --git a/manifests/init.pp b/manifests/init.pp index cd9b558b..314c5bec 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -330,12 +330,12 @@ class ironic ( $versioned_notifications_topics = $::os_service_default, ) { - include ::ironic::deps - include ::ironic::db - include ::ironic::params + include ironic::deps + include ironic::db + include ironic::params - include ::ironic::glance - include ::ironic::neutron + include ironic::glance + include ironic::neutron ensure_resource( 'package', 'ironic-common', { ensure => $package_ensure, @@ -362,11 +362,11 @@ class ironic ( } if $sync_db { - include ::ironic::db::sync + include ironic::db::sync } if $db_online_data_migrations { - include ::ironic::db::online_data_migrations + include ironic::db::online_data_migrations } oslo::messaging::default {'ironic_config': diff --git a/manifests/inspector.pp b/manifests/inspector.pp index c6ebcc60..17ef07de 100644 --- a/manifests/inspector.pp +++ b/manifests/inspector.pp @@ -299,13 +299,13 @@ class ironic::inspector ( $default_transport_url = 'fake://', ) { - include ::ironic::deps - include ::ironic::params - include ::ironic::pxe::common - include ::ironic::inspector::db + include ironic::deps + include ironic::params + include ironic::pxe::common + include ironic::inspector::db if $auth_strategy == 'keystone' { - include ::ironic::inspector::authtoken + include ironic::inspector::authtoken } if !is_array($dnsmasq_ip_subnets) { @@ -423,7 +423,7 @@ class ironic::inspector ( } if $sync_db { - include ::ironic::inspector::db::sync + include ironic::inspector::db::sync } if $enabled { diff --git a/manifests/inspector/authtoken.pp b/manifests/inspector/authtoken.pp index 56b019d2..d9e32ad2 100644 --- a/manifests/inspector/authtoken.pp +++ b/manifests/inspector/authtoken.pp @@ -214,7 +214,7 @@ class ironic::inspector::authtoken( $service_token_roles_required = $::os_service_default, ) { - include ::ironic::deps + include ironic::deps if is_service_default($password) { fail('Please set password for Ironic Inspector service user') diff --git a/manifests/inspector/client.pp b/manifests/inspector/client.pp index b17661d7..994227e4 100644 --- a/manifests/inspector/client.pp +++ b/manifests/inspector/client.pp @@ -12,8 +12,8 @@ class ironic::inspector::client ( $package_ensure = present ) { - include ::ironic::deps - include ::ironic::params + include ironic::deps + include ironic::params package { 'python-ironic-inspector-client': ensure => $package_ensure, diff --git a/manifests/inspector/cors.pp b/manifests/inspector/cors.pp index b20c13bd..c9671c2f 100644 --- a/manifests/inspector/cors.pp +++ b/manifests/inspector/cors.pp @@ -45,7 +45,7 @@ class ironic::inspector::cors ( $allow_headers = $::os_service_default, ) { - include ::ironic::deps + include ironic::deps oslo::cors { 'ironic_inspector_config': allowed_origin => $allowed_origin, diff --git a/manifests/inspector/db.pp b/manifests/inspector/db.pp index 41ccfc8c..3df1bf69 100644 --- a/manifests/inspector/db.pp +++ b/manifests/inspector/db.pp @@ -62,7 +62,7 @@ class ironic::inspector::db ( $database_idle_timeout = undef, ) { - include ::ironic::params + include ironic::params if $database_idle_timeout { warning('The database_idle_timeout parameter is deprecated. Please use \ diff --git a/manifests/inspector/db/sync.pp b/manifests/inspector/db/sync.pp index c9d452a7..9f328359 100644 --- a/manifests/inspector/db/sync.pp +++ b/manifests/inspector/db/sync.pp @@ -3,8 +3,8 @@ # class ironic::inspector::db::sync { - include ::ironic::deps - include ::ironic::params + include ironic::deps + include ironic::params exec { 'ironic-inspector-dbsync': command => $::ironic::params::inspector_dbsync_command, diff --git a/manifests/inspector/logging.pp b/manifests/inspector/logging.pp index d750ebce..c271ef71 100644 --- a/manifests/inspector/logging.pp +++ b/manifests/inspector/logging.pp @@ -114,7 +114,7 @@ class ironic::inspector::logging( $log_date_format = $::os_service_default, ) { - include ::ironic::deps + include ironic::deps oslo::log { 'ironic_inspector_config': debug => $debug, diff --git a/manifests/inspector/pxe_filter.pp b/manifests/inspector/pxe_filter.pp index 5474e0fd..4cb5752c 100644 --- a/manifests/inspector/pxe_filter.pp +++ b/manifests/inspector/pxe_filter.pp @@ -28,7 +28,7 @@ class ironic::inspector::pxe_filter ( $sync_period = $::os_service_default, ) { - include ::ironic::deps + include ironic::deps ironic_inspector_config { 'pxe_filter/driver': value => $driver; diff --git a/manifests/inspector/pxe_filter/dnsmasq.pp b/manifests/inspector/pxe_filter/dnsmasq.pp index 606e6691..db0b7bc8 100644 --- a/manifests/inspector/pxe_filter/dnsmasq.pp +++ b/manifests/inspector/pxe_filter/dnsmasq.pp @@ -36,8 +36,8 @@ class ironic::inspector::pxe_filter::dnsmasq ( $purge_dhcp_hostsdir = $::os_service_default, ) { - include ::ironic::deps - include ::ironic::inspector + include ironic::deps + include ironic::inspector $hostsdir = pick($::ironic::inspector::dnsmasq_dhcp_hostsdir, $::os_service_default) diff --git a/manifests/keystone/auth.pp b/manifests/keystone/auth.pp index 7201aaca..3df25e64 100644 --- a/manifests/keystone/auth.pp +++ b/manifests/keystone/auth.pp @@ -104,7 +104,7 @@ class ironic::keystone::auth ( $internal_url = 'http://127.0.0.1:6385', ) { - include ::ironic::deps + include ironic::deps if $configure_user_role { Keystone_user_role["${auth_name}@${tenant}"] ~> Service <| name == 'ironic-server' |> diff --git a/manifests/keystone/auth_inspector.pp b/manifests/keystone/auth_inspector.pp index 80bf3110..3be07981 100644 --- a/manifests/keystone/auth_inspector.pp +++ b/manifests/keystone/auth_inspector.pp @@ -95,7 +95,7 @@ class ironic::keystone::auth_inspector ( $internal_url = 'http://127.0.0.1:5050', ) { - include ::ironic::deps + include ironic::deps $real_service_name = pick($service_name, $auth_name) diff --git a/manifests/logging.pp b/manifests/logging.pp index b885c748..39204a9f 100644 --- a/manifests/logging.pp +++ b/manifests/logging.pp @@ -119,7 +119,7 @@ class ironic::logging( $log_date_format = $::os_service_default, ) { - include ::ironic::deps + include ironic::deps oslo::log { 'ironic_config': debug => $debug, diff --git a/manifests/params.pp b/manifests/params.pp index 794469c4..b6e26105 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -20,7 +20,7 @@ # Parameters for puppet-ironic # class ironic::params { - include ::openstacklib::defaults + include openstacklib::defaults $pyvers = $::openstacklib::defaults::pyvers $pyver3 = $::openstacklib::defaults::pyver3 diff --git a/manifests/policy.pp b/manifests/policy.pp index 723f729e..195aba5d 100644 --- a/manifests/policy.pp +++ b/manifests/policy.pp @@ -28,8 +28,8 @@ class ironic::policy ( $policy_path = '/etc/ironic/policy.json', ) { - include ::ironic::deps - include ::ironic::params + include ironic::deps + include ironic::params validate_legacy(Hash, 'validate_hash', $policies) diff --git a/manifests/pxe.pp b/manifests/pxe.pp index d05d7c6c..19ab5cc2 100644 --- a/manifests/pxe.pp +++ b/manifests/pxe.pp @@ -62,8 +62,8 @@ class ironic::pxe ( $enable_ppc64le = false, ) inherits ::ironic::params { - include ::ironic::deps - include ::ironic::pxe::common + include ironic::deps + include ironic::pxe::common $tftp_root_real = pick($::ironic::pxe::common::tftp_root, $tftp_root) $http_root_real = pick($::ironic::pxe::common::http_root, $http_root) @@ -124,7 +124,7 @@ class ironic::pxe ( }) $options = "--map-file ${tftp_root_real}/map-file" - include ::xinetd + include xinetd xinetd::service { 'tftp': port => '69', @@ -186,7 +186,7 @@ class ironic::pxe ( require => Anchor['ironic-inspector::install::end'], } - include ::apache + include apache apache::vhost { 'ipxe_vhost': priority => '10', diff --git a/manifests/pxe/common.pp b/manifests/pxe/common.pp index d5007792..52b43a82 100644 --- a/manifests/pxe/common.pp +++ b/manifests/pxe/common.pp @@ -43,5 +43,5 @@ class ironic::pxe::common ( $http_port = undef, $ipxe_timeout = undef, ) { - include ::ironic::deps + include ironic::deps } diff --git a/manifests/pxe/tftpboot_file.pp b/manifests/pxe/tftpboot_file.pp index 4e5607f3..e0adecd4 100644 --- a/manifests/pxe/tftpboot_file.pp +++ b/manifests/pxe/tftpboot_file.pp @@ -32,7 +32,7 @@ define ironic::pxe::tftpboot_file ( $destination_directory, $file = $title, ) { - include ::ironic::deps + include ironic::deps file {"${destination_directory}/${file}": ensure => 'present', diff --git a/manifests/service_catalog.pp b/manifests/service_catalog.pp index 7035e247..85db6457 100644 --- a/manifests/service_catalog.pp +++ b/manifests/service_catalog.pp @@ -55,7 +55,7 @@ class ironic::service_catalog ( $endpoint_override = $::os_service_default, ) { - include ::ironic::deps + include ironic::deps ironic_config { 'service_catalog/auth_type': value => $auth_type; diff --git a/manifests/wsgi/apache.pp b/manifests/wsgi/apache.pp index dd695ddc..020fbc4b 100644 --- a/manifests/wsgi/apache.pp +++ b/manifests/wsgi/apache.pp @@ -120,12 +120,12 @@ class ironic::wsgi::apache ( $custom_wsgi_process_options = {}, ) { - include ::ironic::deps - include ::ironic::params - include ::apache - include ::apache::mod::wsgi + include ironic::deps + include ironic::params + include apache + include apache::mod::wsgi if $ssl { - include ::apache::mod::ssl + include apache::mod::ssl } ::openstacklib::wsgi::apache { 'ironic_wsgi': diff --git a/spec/acceptance/ironic_wsgi_apache_spec.rb b/spec/acceptance/ironic_wsgi_apache_spec.rb index a944a751..678e5fd4 100644 --- a/spec/acceptance/ironic_wsgi_apache_spec.rb +++ b/spec/acceptance/ironic_wsgi_apache_spec.rb @@ -6,12 +6,12 @@ describe 'basic ironic' 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::ironic + include openstack_integration + include openstack_integration::repos + include openstack_integration::rabbitmq + include openstack_integration::mysql + include openstack_integration::keystone + include openstack_integration::ironic EOS diff --git a/spec/classes/ironic_api_spec.rb b/spec/classes/ironic_api_spec.rb index 0999f383..25941cfb 100644 --- a/spec/classes/ironic_api_spec.rb +++ b/spec/classes/ironic_api_spec.rb @@ -22,7 +22,7 @@ require 'spec_helper' describe 'ironic::api' do let :pre_condition do - "class { '::ironic::api::authtoken': + "class { 'ironic::api::authtoken': password => 'password', }" end @@ -120,10 +120,10 @@ describe 'ironic::api' do end let :pre_condition do - "class { '::ironic::api::authtoken': + "class { 'ironic::api::authtoken': password => 'password', } - include ::apache" + include apache" end it 'configures ironic-api service with Apache' do @@ -142,10 +142,10 @@ describe 'ironic::api' do end let :pre_condition do - "class { '::ironic::api::authtoken': + "class { 'ironic::api::authtoken': password => 'password', } - include ::apache" + include apache" end it_raises 'a Puppet::Error', /Invalid service_name/