From 7deecfbdf26ef9d6eb4c7b965b0bd6ec69b3a30b Mon Sep 17 00:00:00 2001 From: Tobias Urdin Date: Sun, 8 Dec 2019 23:13:08 +0100 Subject: [PATCH] Convert all class usage to relative names Change-Id: Ibe5a433cb67c38c0c9b05a50bffa2eda7391f241 --- examples/nova_with_pacemaker.pp | 10 +++---- examples/nova_wsgi.pp | 20 ++++++------- manifests/api.pp | 18 +++++------ manifests/cache.pp | 2 +- manifests/cell_v2/discover_hosts.pp | 4 +-- manifests/cell_v2/map_cell0.pp | 4 +-- manifests/cell_v2/map_cell_and_hosts.pp | 4 +-- manifests/cell_v2/map_instances.pp | 4 +-- manifests/cell_v2/simple_setup.pp | 6 ++-- manifests/cinder.pp | 2 +- manifests/client.pp | 4 +-- manifests/compute.pp | 14 ++++----- manifests/compute/ironic.pp | 4 +-- manifests/compute/libvirt.pp | 10 +++---- manifests/compute/libvirt/qemu.pp | 2 +- manifests/compute/libvirt/services.pp | 4 +-- manifests/compute/libvirt_guests.pp | 4 +-- manifests/compute/pci.pp | 2 +- manifests/compute/rbd.pp | 4 +-- manifests/compute/serial.pp | 2 +- manifests/compute/spice.pp | 2 +- manifests/compute/vgpu.pp | 2 +- manifests/compute/vmware.pp | 2 +- manifests/compute/xenserver.pp | 2 +- manifests/conductor.pp | 10 +++---- manifests/config.pp | 2 +- manifests/cors.pp | 2 +- manifests/cron/archive_deleted_rows.pp | 4 +-- manifests/cron/purge_shadow_tables.pp | 4 +-- manifests/db.pp | 4 +-- manifests/db/mysql.pp | 2 +- manifests/db/mysql_api.pp | 2 +- manifests/db/online_data_migrations.pp | 4 +-- manifests/db/postgresql.pp | 2 +- manifests/db/postgresql_api.pp | 2 +- manifests/db/sync.pp | 4 +-- manifests/db/sync_api.pp | 6 ++-- manifests/generic_service.pp | 4 +-- manifests/init.pp | 4 +-- manifests/ironic/common.pp | 2 +- manifests/keystone/auth.pp | 2 +- manifests/keystone/authtoken.pp | 2 +- manifests/keystone/service_user.pp | 2 +- manifests/logging.pp | 4 +-- manifests/manage/floating.pp | 2 +- manifests/metadata.pp | 6 ++-- manifests/metadata/novajoin/api.pp | 4 +-- manifests/migration/libvirt.pp | 2 +- manifests/migration/qemu.pp | 2 +- manifests/network/neutron.pp | 2 +- manifests/params.pp | 2 +- manifests/patch/config.pp | 2 +- manifests/pci.pp | 2 +- manifests/placement.pp | 2 +- manifests/policy.pp | 4 +-- manifests/quota.pp | 2 +- manifests/scheduler.pp | 8 ++--- manifests/scheduler/filter.pp | 2 +- manifests/serialproxy.pp | 4 +-- manifests/spicehtml5proxy.pp | 4 +-- manifests/vendordata.pp | 2 +- manifests/vncproxy.pp | 4 +-- manifests/vncproxy/common.pp | 2 +- manifests/wsgi/apache_api.pp | 8 ++--- manifests/wsgi/apache_metadata.pp | 8 ++--- spec/acceptance/nova_wsgi_apache_spec.rb | 16 +++++----- spec/classes/nova_api_spec.rb | 30 +++++++++---------- spec/classes/nova_keystone_auth_spec.rb | 2 +- .../nova_metadata_novajoin_api_spec.rb | 4 +-- .../nova_metadata_novajoin_auth_spec.rb | 6 ++-- spec/classes/nova_metadata_spec.rb | 6 ++-- spec/classes/nova_wsgi_apache_api_spec.rb | 8 ++--- spec/fixtures/manifests/site.pp | 4 +-- 73 files changed, 175 insertions(+), 175 deletions(-) diff --git a/examples/nova_with_pacemaker.pp b/examples/nova_with_pacemaker.pp index 6eb0b3513..f6a7e3054 100644 --- a/examples/nova_with_pacemaker.pp +++ b/examples/nova_with_pacemaker.pp @@ -24,25 +24,25 @@ # sudo pcs constraint colocation add nova_api_service with nova_vip # sudo pcs constraint colocation add nova_novncproxy_service with nova_vip -class { '::nova': } +class { 'nova': } -class { '::nova::api': +class { 'nova::api': enabled => false, manage_service => false, admin_password => 'PASSWORD', } -class { '::nova::conductor': +class { 'nova::conductor': enabled => false, manage_service => false, } -class { '::nova::scheduler': +class { 'nova::scheduler': enabled => false, manage_service => false, } -class { '::nova::vncproxy': +class { 'nova::vncproxy': enabled => false, manage_service => false, } diff --git a/examples/nova_wsgi.pp b/examples/nova_wsgi.pp index 814c15b3b..138eee7c6 100644 --- a/examples/nova_wsgi.pp +++ b/examples/nova_wsgi.pp @@ -1,31 +1,31 @@ # This manifest documents different use cases when running WSGI in Nova API # Use Case #1: running Nova API with osapi_compute in WSGI, and metadata -class { '::nova': } -class { '::nova::api': +class { 'nova': } +class { 'nova::api': admin_password => 'a_big_secret', service_name => 'httpd', } -include ::apache -class { '::nova::wsgi::apache': +include apache +class { 'nova::wsgi::apache': ssl => false, } # Use Case #2: running Nova API with osapi_compute in WSGI, and metadata disabled -class { '::nova': } -class { '::nova::api': +class { 'nova': } +class { 'nova::api': admin_password => 'a_big_secret', enabled_apis => ['osapi_compute'], service_name => 'httpd', } -include ::apache -class { '::nova::wsgi::apache': +include apache +class { 'nova::wsgi::apache': ssl => false, } # Use Case #3: not running osapi_compute, just enabling metadata -class { '::nova': } -class { '::nova::api': +class { 'nova': } +class { 'nova::api': admin_password => 'a_big_secret', enabled_apis => ['metadata'], } diff --git a/manifests/api.pp b/manifests/api.pp index 422be395e..4d83f39c0 100644 --- a/manifests/api.pp +++ b/manifests/api.pp @@ -225,11 +225,11 @@ class nova::api( $fping_path = undef, ) inherits nova::params { - include ::nova::deps - include ::nova::db - include ::nova::policy - include ::nova::keystone::authtoken - include ::nova::availability_zone + include nova::deps + include nova::db + include nova::policy + include nova::keystone::authtoken + include nova::availability_zone if !$nova_metadata_wsgi_enabled { warning('Running nova metadata api via evenlet is deprecated and will be removed in Stein release.') @@ -240,7 +240,7 @@ class nova::api( } if $install_cinder_client { - include ::cinder::client + include cinder::client Class['cinder::client'] ~> Nova::Generic_service['api'] } @@ -351,13 +351,13 @@ as a standalone service, or httpd for being run by a httpd server") # Added arg and if statement prevents this from being run # where db is not active i.e. the compute if $sync_db { - include ::nova::db::sync + include nova::db::sync } if $sync_db_api { - include ::nova::db::sync_api + include nova::db::sync_api } if $db_online_data_migrations { - include ::nova::db::online_data_migrations + include nova::db::online_data_migrations } # Remove auth configuration from api-paste.ini diff --git a/manifests/cache.pp b/manifests/cache.pp index d01fddad5..e566db909 100644 --- a/manifests/cache.pp +++ b/manifests/cache.pp @@ -102,7 +102,7 @@ class nova::cache ( $manage_backend_package = true, ) { - include ::nova::deps + include nova::deps oslo::cache { 'nova_config': config_prefix => $config_prefix, diff --git a/manifests/cell_v2/discover_hosts.pp b/manifests/cell_v2/discover_hosts.pp index c392e2b03..ef69c0ae6 100644 --- a/manifests/cell_v2/discover_hosts.pp +++ b/manifests/cell_v2/discover_hosts.pp @@ -12,8 +12,8 @@ class nova::cell_v2::discover_hosts ( $extra_params = '', ) { - include ::nova::deps - include ::nova::params + include nova::deps + include nova::params exec { 'nova-cell_v2-discover_hosts': path => ['/bin', '/usr/bin'], diff --git a/manifests/cell_v2/map_cell0.pp b/manifests/cell_v2/map_cell0.pp index 40ace350e..db0dcaa68 100644 --- a/manifests/cell_v2/map_cell0.pp +++ b/manifests/cell_v2/map_cell0.pp @@ -15,8 +15,8 @@ class nova::cell_v2::map_cell0 ( $extra_params = '', ) { - include ::nova::deps - include ::nova::params + include nova::deps + include nova::params exec { 'nova-cell_v2-map_cell0': path => ['/bin', '/usr/bin'], diff --git a/manifests/cell_v2/map_cell_and_hosts.pp b/manifests/cell_v2/map_cell_and_hosts.pp index 5d4cfabf1..0040eadd3 100644 --- a/manifests/cell_v2/map_cell_and_hosts.pp +++ b/manifests/cell_v2/map_cell_and_hosts.pp @@ -12,8 +12,8 @@ class nova::cell_v2::map_cell_and_hosts ( $extra_params = '', ) { - include ::nova::deps - include ::nova::params + include nova::deps + include nova::params exec { 'nova-cell_v2-map_cell_and_hosts': path => ['/bin', '/usr/bin'], diff --git a/manifests/cell_v2/map_instances.pp b/manifests/cell_v2/map_instances.pp index 7d900447d..578c69f65 100644 --- a/manifests/cell_v2/map_instances.pp +++ b/manifests/cell_v2/map_instances.pp @@ -25,8 +25,8 @@ class nova::cell_v2::map_instances ( $extra_params = '', ) { - include ::nova::deps - include ::nova::params + include nova::deps + include nova::params if (!$cell_uuid and !$cell_name) { fail('Either cell_uuid or cell_name must be provided') diff --git a/manifests/cell_v2/simple_setup.pp b/manifests/cell_v2/simple_setup.pp index 147627dbd..1907fd1d2 100644 --- a/manifests/cell_v2/simple_setup.pp +++ b/manifests/cell_v2/simple_setup.pp @@ -34,9 +34,9 @@ class nova::cell_v2::simple_setup ( $database_connection_cell0 = 'default', ) { - include ::nova::deps + include nova::deps - include ::nova::cell_v2::map_cell0 + include nova::cell_v2::map_cell0 nova_cell_v2 { 'cell0': database_connection => $database_connection_cell0 @@ -47,7 +47,7 @@ class nova::cell_v2::simple_setup ( database_connection => $database_connection } - include ::nova::cell_v2::discover_hosts + include nova::cell_v2::discover_hosts Class['nova::cell_v2::map_cell0'] -> Nova_cell_v2 <| |> diff --git a/manifests/cinder.pp b/manifests/cinder.pp index 115daa3c1..320693246 100644 --- a/manifests/cinder.pp +++ b/manifests/cinder.pp @@ -61,7 +61,7 @@ class nova::cinder ( ) { - include ::nova::deps + include nova::deps nova_config { 'cinder/password': value => $password, secret => true; diff --git a/manifests/client.pp b/manifests/client.pp index 977dadaff..f9ed3409c 100644 --- a/manifests/client.pp +++ b/manifests/client.pp @@ -11,8 +11,8 @@ class nova::client( $ensure = 'present' ) { - include ::nova::deps - include ::nova::params + include nova::deps + include nova::params package { 'python-novaclient': ensure => $ensure, diff --git a/manifests/compute.pp b/manifests/compute.pp index fda44d2fe..f86a96412 100644 --- a/manifests/compute.pp +++ b/manifests/compute.pp @@ -241,15 +241,15 @@ class nova::compute ( $vcpu_pin_set = undef, ) { - include ::nova::deps - include ::nova::params + include nova::deps + include nova::params $cpu_shared_set_real = pick(join(any2array($cpu_shared_set), ','), $::os_service_default) $cpu_dedicated_set_real = pick(join(any2array($cpu_dedicated_set), ','), $::os_service_default) - include ::nova::pci - include ::nova::compute::vgpu - include ::nova::vendordata + include nova::pci + include nova::compute::vgpu + include nova::vendordata if $vnc_keymap { warning('vnc_keymap parameter is deprecated, has no effect and will be removed in the future.') @@ -350,7 +350,7 @@ class nova::compute ( $reserved_huge_pages_real = $::os_service_default } - include ::nova::availability_zone + include nova::availability_zone nova_config { 'DEFAULT/reserved_host_memory_mb': value => $reserved_host_memory; @@ -373,7 +373,7 @@ class nova::compute ( ensure_resource('nova_config', 'DEFAULT/allow_resize_to_same_host', { value => $allow_resize_to_same_host }) if ($vnc_enabled) { - include ::nova::vncproxy::common + include nova::vncproxy::common nova_config { 'vnc/server_proxyclient_address': value => $vncserver_proxyclient_address; diff --git a/manifests/compute/ironic.pp b/manifests/compute/ironic.pp index 747436e63..406d03d97 100644 --- a/manifests/compute/ironic.pp +++ b/manifests/compute/ironic.pp @@ -17,9 +17,9 @@ class nova::compute::ironic ( $compute_driver = 'ironic.IronicDriver' ) { - include ::nova::deps + include nova::deps require ::nova::ironic::common - include ::ironic::client + include ironic::client nova_config { 'DEFAULT/compute_driver': value => $compute_driver; diff --git a/manifests/compute/libvirt.pp b/manifests/compute/libvirt.pp index 196557001..1d5a0b4ec 100644 --- a/manifests/compute/libvirt.pp +++ b/manifests/compute/libvirt.pp @@ -224,8 +224,8 @@ class nova::compute::libvirt ( $tls_priority = undef, ) inherits nova::params { - include ::nova::deps - include ::nova::params + include nova::deps + include nova::params # libvirt_cpu_mode has different defaults depending on hypervisor. if !$libvirt_cpu_mode { @@ -249,7 +249,7 @@ class nova::compute::libvirt ( } if $migration_support { - include ::nova::migration::libvirt + include nova::migration::libvirt } if $log_outputs { @@ -283,7 +283,7 @@ class nova::compute::libvirt ( # # If you're using hiera: # - set nova::compute::libvirt::manage_libvirt_services to false - # - include ::nova::compute::libvirt::services in your composition layer + # - include nova::compute::libvirt::services in your composition layer # - select which services you want to deploy with # ::nova::compute::libvirt::services:* parameters. # @@ -292,7 +292,7 @@ class nova::compute::libvirt ( # - select which services you want to deploy with # ::nova::compute::libvirt::*_service_name parameters. if $manage_libvirt_services { - class { '::nova::compute::libvirt::services': + class { 'nova::compute::libvirt::services': libvirt_service_name => $libvirt_service_name, virtlock_service_name => $virtlock_service_name, virtlog_service_name => $virtlog_service_name, diff --git a/manifests/compute/libvirt/qemu.pp b/manifests/compute/libvirt/qemu.pp index da20afb81..e0729e642 100644 --- a/manifests/compute/libvirt/qemu.pp +++ b/manifests/compute/libvirt/qemu.pp @@ -54,7 +54,7 @@ class nova::compute::libvirt::qemu( $libvirt_version = $::nova::compute::libvirt::version::default, ) inherits nova::compute::libvirt::version { - include ::nova::deps + include nova::deps require ::nova::compute::libvirt Anchor['nova::config::begin'] diff --git a/manifests/compute/libvirt/services.pp b/manifests/compute/libvirt/services.pp index 90e651a6a..624e334c3 100644 --- a/manifests/compute/libvirt/services.pp +++ b/manifests/compute/libvirt/services.pp @@ -27,8 +27,8 @@ class nova::compute::libvirt::services ( $libvirt_virt_type = 'kvm', ) inherits nova::params { - include ::nova::deps - include ::nova::params + include nova::deps + include nova::params if $libvirt_service_name { # libvirt-nwfilter diff --git a/manifests/compute/libvirt_guests.pp b/manifests/compute/libvirt_guests.pp index ec20d6704..6b146fe8f 100644 --- a/manifests/compute/libvirt_guests.pp +++ b/manifests/compute/libvirt_guests.pp @@ -54,8 +54,8 @@ class nova::compute::libvirt_guests ( $on_shutdown = 'shutdown', $manage_service = false, ) { - include ::nova::params - include ::nova::deps + include nova::params + include nova::deps Anchor['nova::config::begin'] -> File_line<| tag == 'libvirt-guests-file_line'|> diff --git a/manifests/compute/pci.pp b/manifests/compute/pci.pp index c0c62d4c4..440181fa3 100644 --- a/manifests/compute/pci.pp +++ b/manifests/compute/pci.pp @@ -14,7 +14,7 @@ class nova::compute::pci( $passthrough = $::os_service_default ) { - include ::nova::deps + include nova::deps $picked_passthrough = pick_default($::nova::compute::pci_passthrough,$passthrough) diff --git a/manifests/compute/rbd.pp b/manifests/compute/rbd.pp index 19dc7fbef..0c81142b6 100644 --- a/manifests/compute/rbd.pp +++ b/manifests/compute/rbd.pp @@ -74,8 +74,8 @@ class nova::compute::rbd ( $ceph_client_ensure = 'present', ) { - include ::nova::deps - include ::nova::params + include nova::deps + include nova::params if $manage_ceph_client { # Install ceph client libraries diff --git a/manifests/compute/serial.pp b/manifests/compute/serial.pp index 422c0af2d..0cdf75922 100644 --- a/manifests/compute/serial.pp +++ b/manifests/compute/serial.pp @@ -23,7 +23,7 @@ class nova::compute::serial( $proxyclient_address = '127.0.0.1', ) { - include ::nova::deps + include nova::deps nova_config { 'serial_console/enabled': value => true; diff --git a/manifests/compute/spice.pp b/manifests/compute/spice.pp index dac402389..9fb8dd0a6 100644 --- a/manifests/compute/spice.pp +++ b/manifests/compute/spice.pp @@ -51,7 +51,7 @@ class nova::compute::spice( $keymap = undef, ) { - include ::nova::deps + include nova::deps if $keymap { warning('keymap parameter is deprecated, has no effect and will be removed in the future.') diff --git a/manifests/compute/vgpu.pp b/manifests/compute/vgpu.pp index 966d703cd..2da7bb31c 100644 --- a/manifests/compute/vgpu.pp +++ b/manifests/compute/vgpu.pp @@ -12,7 +12,7 @@ class nova::compute::vgpu( $enabled_vgpu_types = $::os_service_default ) { - include ::nova::deps + include nova::deps nova_config { 'devices/enabled_vgpu_types': value => join(any2array($enabled_vgpu_types), ','); diff --git a/manifests/compute/vmware.pp b/manifests/compute/vmware.pp index b150dbf87..24dc06929 100644 --- a/manifests/compute/vmware.pp +++ b/manifests/compute/vmware.pp @@ -72,7 +72,7 @@ class nova::compute::vmware( $datastore_regex = $::os_service_default, ) { - include ::nova::deps + include nova::deps nova_config { 'DEFAULT/compute_driver': value => $compute_driver; diff --git a/manifests/compute/xenserver.pp b/manifests/compute/xenserver.pp index 3e331651c..56857c8c9 100644 --- a/manifests/compute/xenserver.pp +++ b/manifests/compute/xenserver.pp @@ -273,7 +273,7 @@ class nova::compute::xenserver( $introduce_vdi_retry_wait = $::os_service_default, ) { - include ::nova::deps + include nova::deps nova_config { 'DEFAULT/compute_driver': value => $compute_driver; diff --git a/manifests/conductor.pp b/manifests/conductor.pp index a8e835d30..049cfe51e 100644 --- a/manifests/conductor.pp +++ b/manifests/conductor.pp @@ -35,11 +35,11 @@ class nova::conductor( $enable_new_services = $::os_service_default, ) { - include ::nova::deps - include ::nova::db - include ::nova::params - include ::nova::workarounds - include ::nova::availability_zone + include nova::deps + include nova::db + include nova::params + include nova::workarounds + include nova::availability_zone nova::generic_service { 'conductor': enabled => $enabled, diff --git a/manifests/config.pp b/manifests/config.pp index 9fe04c6dc..f27d56b26 100644 --- a/manifests/config.pp +++ b/manifests/config.pp @@ -32,7 +32,7 @@ class nova::config ( $nova_paste_api_ini = {}, ) { - include ::nova::deps + include nova::deps validate_legacy(Hash, 'validate_hash', $nova_config) validate_legacy(Hash, 'validate_hash', $nova_paste_api_ini) diff --git a/manifests/cors.pp b/manifests/cors.pp index 95b79a78e..5c044c381 100644 --- a/manifests/cors.pp +++ b/manifests/cors.pp @@ -45,7 +45,7 @@ class nova::cors ( $allow_headers = $::os_service_default, ) { - include ::nova::deps + include nova::deps oslo::cors { 'nova_config': allowed_origin => $allowed_origin, diff --git a/manifests/cron/archive_deleted_rows.pp b/manifests/cron/archive_deleted_rows.pp index 78ce2eea7..6ef9ceb53 100644 --- a/manifests/cron/archive_deleted_rows.pp +++ b/manifests/cron/archive_deleted_rows.pp @@ -92,8 +92,8 @@ class nova::cron::archive_deleted_rows ( $age = undef, ) { - include ::nova::deps - include ::nova::params + include nova::deps + include nova::params if $until_complete { $until_complete_real = '--until-complete' diff --git a/manifests/cron/purge_shadow_tables.pp b/manifests/cron/purge_shadow_tables.pp index 6c8a6493d..46e6db637 100644 --- a/manifests/cron/purge_shadow_tables.pp +++ b/manifests/cron/purge_shadow_tables.pp @@ -75,8 +75,8 @@ class nova::cron::purge_shadow_tables ( $maxdelay = 0, ) { - include ::nova::deps - include ::nova::params + include nova::deps + include nova::params if $verbose { $verbose_real = '--verbose' diff --git a/manifests/db.pp b/manifests/db.pp index 2db46a9fe..09a166f96 100644 --- a/manifests/db.pp +++ b/manifests/db.pp @@ -94,8 +94,8 @@ class nova::db ( $database_idle_timeout = undef, ) { - include ::nova::deps - include ::nova::params + include nova::deps + include nova::params 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 397ea8e7c..ba7622181 100644 --- a/manifests/db/mysql.pp +++ b/manifests/db/mysql.pp @@ -47,7 +47,7 @@ class nova::db::mysql( $setup_cell0 = true, ) { - include ::nova::deps + include nova::deps ::openstacklib::db::mysql { 'nova': user => $user, diff --git a/manifests/db/mysql_api.pp b/manifests/db/mysql_api.pp index cf0ed335c..60bfe2039 100644 --- a/manifests/db/mysql_api.pp +++ b/manifests/db/mysql_api.pp @@ -41,7 +41,7 @@ class nova::db::mysql_api( $allowed_hosts = undef, ) { - include ::nova::deps + include nova::deps ::openstacklib::db::mysql { 'nova_api': user => $user, diff --git a/manifests/db/online_data_migrations.pp b/manifests/db/online_data_migrations.pp index a4db8612d..018df64c6 100644 --- a/manifests/db/online_data_migrations.pp +++ b/manifests/db/online_data_migrations.pp @@ -18,8 +18,8 @@ class nova::db::online_data_migrations( $db_sync_timeout = 300, ) { - include ::nova::deps - include ::nova::params + include nova::deps + include nova::params exec { 'nova-db-online-data-migrations': command => "/usr/bin/nova-manage ${extra_params} db online_data_migrations", diff --git a/manifests/db/postgresql.pp b/manifests/db/postgresql.pp index 9d11e1067..863f59b71 100644 --- a/manifests/db/postgresql.pp +++ b/manifests/db/postgresql.pp @@ -38,7 +38,7 @@ class nova::db::postgresql( $setup_cell0 = true, ) { - include ::nova::deps + include nova::deps ::openstacklib::db::postgresql { 'nova': password_hash => postgresql_password($user, $password), diff --git a/manifests/db/postgresql_api.pp b/manifests/db/postgresql_api.pp index df94bbd5e..62e8a3aee 100644 --- a/manifests/db/postgresql_api.pp +++ b/manifests/db/postgresql_api.pp @@ -32,7 +32,7 @@ class nova::db::postgresql_api( $privileges = 'ALL', ) { - include ::nova::deps + include nova::deps ::openstacklib::db::postgresql { 'nova_api': password_hash => postgresql_password($user, $password), diff --git a/manifests/db/sync.pp b/manifests/db/sync.pp index d26011134..b0c1b1b88 100644 --- a/manifests/db/sync.pp +++ b/manifests/db/sync.pp @@ -18,8 +18,8 @@ class nova::db::sync( $db_sync_timeout = 300, ) { - include ::nova::deps - include ::nova::params + include nova::deps + include nova::params exec { 'nova-db-sync': command => "/usr/bin/nova-manage ${extra_params} db sync", diff --git a/manifests/db/sync_api.pp b/manifests/db/sync_api.pp index 02868a43e..3b039a0dd 100644 --- a/manifests/db/sync_api.pp +++ b/manifests/db/sync_api.pp @@ -27,8 +27,8 @@ class nova::db::sync_api( $db_sync_timeout = 300, ) { - include ::nova::deps - include ::nova::params + include nova::deps + include nova::params exec { 'nova-db-sync-api': command => "/usr/bin/nova-manage ${extra_params} api_db sync", @@ -49,6 +49,6 @@ class nova::db::sync_api( } if $cellv2_setup { - include ::nova::cell_v2::simple_setup + include nova::cell_v2::simple_setup } } diff --git a/manifests/generic_service.pp b/manifests/generic_service.pp index 0f3e37d1e..11b958a7b 100644 --- a/manifests/generic_service.pp +++ b/manifests/generic_service.pp @@ -38,8 +38,8 @@ define nova::generic_service( $ensure_package = 'present' ) { - include ::nova::deps - include ::nova::params + include nova::deps + include nova::params $nova_title = "nova-${name}" diff --git a/manifests/init.pp b/manifests/init.pp index 1155ea188..aaa369e0a 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -514,10 +514,10 @@ class nova( $notify_on_api_faults = undef, ) inherits nova::params { - include ::nova::deps + include nova::deps # maintain backward compatibility - include ::nova::db + include nova::db validate_legacy(Array, 'validate_array', $enabled_ssl_apis) if empty($enabled_ssl_apis) and $use_ssl { diff --git a/manifests/ironic/common.pp b/manifests/ironic/common.pp index a6e855e0b..92a073a02 100644 --- a/manifests/ironic/common.pp +++ b/manifests/ironic/common.pp @@ -51,7 +51,7 @@ class nova::ironic::common ( $project_domain_name = 'Default', ) { - include ::nova::deps + include nova::deps nova_config { 'ironic/auth_plugin': value => $auth_plugin; diff --git a/manifests/keystone/auth.pp b/manifests/keystone/auth.pp index 82fb29943..ccdfb187f 100644 --- a/manifests/keystone/auth.pp +++ b/manifests/keystone/auth.pp @@ -76,7 +76,7 @@ class nova::keystone::auth( $configure_user_role = true, ) { - include ::nova::deps + include nova::deps if $configure_endpoint { diff --git a/manifests/keystone/authtoken.pp b/manifests/keystone/authtoken.pp index 30b7c6ec1..6b9055ccb 100644 --- a/manifests/keystone/authtoken.pp +++ b/manifests/keystone/authtoken.pp @@ -214,7 +214,7 @@ class nova::keystone::authtoken( $service_token_roles_required = $::os_service_default, ) { - include ::nova::deps + include nova::deps if is_service_default($password) { fail('Please set password for nova service user') diff --git a/manifests/keystone/service_user.pp b/manifests/keystone/service_user.pp index eb3bf6971..b98acfdb3 100644 --- a/manifests/keystone/service_user.pp +++ b/manifests/keystone/service_user.pp @@ -80,7 +80,7 @@ class nova::keystone::service_user( $region_name = $::os_service_default, ) { - include ::nova::deps + include nova::deps keystone::resource::service_user { 'nova_config': username => $username, diff --git a/manifests/logging.pp b/manifests/logging.pp index 961768cbe..0409ebf4c 100644 --- a/manifests/logging.pp +++ b/manifests/logging.pp @@ -119,8 +119,8 @@ class nova::logging( $log_date_format = $::os_service_default, ) { - include ::nova::deps - include ::nova::params + include nova::deps + include nova::params if !is_service_default($log_dir) { # This should force an update the selinux role if the logfile exists. diff --git a/manifests/manage/floating.pp b/manifests/manage/floating.pp index a9421b0f4..30789960e 100644 --- a/manifests/manage/floating.pp +++ b/manifests/manage/floating.pp @@ -7,7 +7,7 @@ # define nova::manage::floating ( $network ) { - include ::nova::deps + include nova::deps nova_floating { $name: ensure => present, diff --git a/manifests/metadata.pp b/manifests/metadata.pp index 09a09a599..50e2ab980 100644 --- a/manifests/metadata.pp +++ b/manifests/metadata.pp @@ -54,9 +54,9 @@ class nova::metadata( $max_request_body_size = undef, ) inherits nova::params { - include ::nova::deps - include ::nova::db - include ::nova::keystone::authtoken + include nova::deps + include nova::db + include nova::keystone::authtoken if $enabled_apis != undef { warning('enabled_apis parameter is deprecated, use nova::compute::enabled_apis instead.') diff --git a/manifests/metadata/novajoin/api.pp b/manifests/metadata/novajoin/api.pp index 4e1a57b3b..4cedc8c02 100644 --- a/manifests/metadata/novajoin/api.pp +++ b/manifests/metadata/novajoin/api.pp @@ -127,8 +127,8 @@ class nova::metadata::novajoin::api ( $configure_kerberos = false, $ipa_realm = undef, ) { - include ::nova::metadata::novajoin::authtoken - include ::nova::metadata::novajoin::policy + include nova::metadata::novajoin::authtoken + include nova::metadata::novajoin::policy if ! $service_user { fail('service_user is missing') diff --git a/manifests/migration/libvirt.pp b/manifests/migration/libvirt.pp index f7f75c41a..a778074bf 100644 --- a/manifests/migration/libvirt.pp +++ b/manifests/migration/libvirt.pp @@ -107,7 +107,7 @@ class nova::migration::libvirt( $crl_file = undef, ){ - include ::nova::deps + include nova::deps if $transport { $transport_real = $transport diff --git a/manifests/migration/qemu.pp b/manifests/migration/qemu.pp index 50e998aec..49dd23fa6 100644 --- a/manifests/migration/qemu.pp +++ b/manifests/migration/qemu.pp @@ -22,7 +22,7 @@ class nova::migration::qemu( $migration_port_max = 49215, ){ - include ::nova::deps + include nova::deps Anchor['nova::config::begin'] -> Augeas<| tag == 'qemu-conf-augeas'|> diff --git a/manifests/network/neutron.pp b/manifests/network/neutron.pp index d8c80bd05..e9ebb3a51 100644 --- a/manifests/network/neutron.pp +++ b/manifests/network/neutron.pp @@ -124,7 +124,7 @@ class nova::network::neutron ( $dhcp_domain = undef, ) { - include ::nova::deps + include nova::deps if $neutron_url { warning('nova::network::neutron::neutron_url is deprecated, nova behaviour will be default to looking up \ diff --git a/manifests/params.pp b/manifests/params.pp index bf2d38dba..073a36499 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -3,7 +3,7 @@ # These parameters need to be accessed from several locations and # should be considered to be constant class nova::params { - include ::openstacklib::defaults + include openstacklib::defaults $pyvers = $::openstacklib::defaults::pyvers $client_package = "python${pyvers}-novaclient" $group = 'nova' diff --git a/manifests/patch/config.pp b/manifests/patch/config.pp index cf7d0b26b..50c2d0665 100644 --- a/manifests/patch/config.pp +++ b/manifests/patch/config.pp @@ -17,7 +17,7 @@ class nova::patch::config ( $monkey_patch_modules = $::os_service_default, ) { - include ::nova::deps + include nova::deps $monkey_patch_modules_real = pick(join(any2array($monkey_patch_modules), ','), $::os_service_default) diff --git a/manifests/pci.pp b/manifests/pci.pp index 4ba450607..e8368d235 100644 --- a/manifests/pci.pp +++ b/manifests/pci.pp @@ -14,7 +14,7 @@ class nova::pci( $aliases = $::os_service_default ) { - include ::nova::deps + include nova::deps if $aliases and !is_service_default($aliases) and diff --git a/manifests/placement.pp b/manifests/placement.pp index 3742dd8b0..21e5723f7 100644 --- a/manifests/placement.pp +++ b/manifests/placement.pp @@ -69,7 +69,7 @@ class nova::placement( $os_interface = undef, ) inherits nova::params { - include ::nova::deps + include nova::deps if $os_interface { warning('nova::placement::os_interface is deprecated for removal, please use valid_interfaces instead.') diff --git a/manifests/policy.pp b/manifests/policy.pp index 652d29fa8..1a5fe7323 100644 --- a/manifests/policy.pp +++ b/manifests/policy.pp @@ -28,8 +28,8 @@ class nova::policy ( $policy_path = '/etc/nova/policy.json', ) { - include ::nova::deps - include ::nova::params + include nova::deps + include nova::params validate_legacy(Hash, 'validate_hash', $policies) diff --git a/manifests/quota.pp b/manifests/quota.pp index 2c2156ca9..82ae06df1 100644 --- a/manifests/quota.pp +++ b/manifests/quota.pp @@ -92,7 +92,7 @@ class nova::quota( $max_age = 0, ) { - include ::nova::deps + include nova::deps nova_config { 'quota/instances': value => $instances; diff --git a/manifests/scheduler.pp b/manifests/scheduler.pp index c5cf4a8b8..f6f1dd43a 100644 --- a/manifests/scheduler.pp +++ b/manifests/scheduler.pp @@ -58,10 +58,10 @@ class nova::scheduler( $max_placement_results = $::os_service_default, ) { - include ::nova::deps - include ::nova::db - include ::nova::params - include ::nova::availability_zone + include nova::deps + include nova::db + include nova::params + include nova::availability_zone nova::generic_service { 'scheduler': enabled => $enabled, diff --git a/manifests/scheduler/filter.pp b/manifests/scheduler/filter.pp index c42960d41..457d49d16 100644 --- a/manifests/scheduler/filter.pp +++ b/manifests/scheduler/filter.pp @@ -134,7 +134,7 @@ class nova::scheduler::filter ( $scheduler_host_manager = undef, ) { - include ::nova::deps + include nova::deps # The following values are following this rule: # - default is $::os_service_default so Puppet won't try to configure it. diff --git a/manifests/serialproxy.pp b/manifests/serialproxy.pp index fe1b61717..114999ef1 100644 --- a/manifests/serialproxy.pp +++ b/manifests/serialproxy.pp @@ -32,8 +32,8 @@ class nova::serialproxy( $ensure_package = 'present' ) { - include ::nova::deps - include ::nova::params + include nova::deps + include nova::params nova_config { 'serial_console/serialproxy_port': value => $serialproxy_port; diff --git a/manifests/spicehtml5proxy.pp b/manifests/spicehtml5proxy.pp index a44bf0510..c2fb164bc 100644 --- a/manifests/spicehtml5proxy.pp +++ b/manifests/spicehtml5proxy.pp @@ -36,8 +36,8 @@ class nova::spicehtml5proxy( $ensure_package = 'present' ) { - include ::nova::deps - include ::nova::params + include nova::deps + include nova::params # Nodes running spicehtml5proxy do *not* need (and in fact, don't care) # about [spice]/enable to be set. This setting is for compute nodes, diff --git a/manifests/vendordata.pp b/manifests/vendordata.pp index c911ccd60..730b5b3e9 100644 --- a/manifests/vendordata.pp +++ b/manifests/vendordata.pp @@ -96,7 +96,7 @@ class nova::vendordata( # DEPRECATED $vendordata_caller = undef, ) inherits nova::params { - include ::nova::deps + include nova::deps # TODO(mschuppert): In order to keep backward compatibility we rely on the # pick function. When vendordata parameters got removed from ::nova::api and diff --git a/manifests/vncproxy.pp b/manifests/vncproxy.pp index 3c0b6d89f..380a10184 100644 --- a/manifests/vncproxy.pp +++ b/manifests/vncproxy.pp @@ -76,8 +76,8 @@ class nova::vncproxy( $vencrypt_ca = undef, ) { - include ::nova::deps - include ::nova::params + include nova::deps + include nova::params if (!$allow_noauth and !$allow_vencrypt) { fail('Either allow_noauth or allow_vencrypt must be true') diff --git a/manifests/vncproxy/common.pp b/manifests/vncproxy/common.pp index b989d8422..44236dec6 100644 --- a/manifests/vncproxy/common.pp +++ b/manifests/vncproxy/common.pp @@ -23,7 +23,7 @@ class nova::vncproxy::common ( $vncproxy_path = undef, ) { - include ::nova::deps + include nova::deps if defined('$::nova::compute::vncproxy_host') { $compute_vncproxy_host_real = $::nova::compute::vncproxy_host diff --git a/manifests/wsgi/apache_api.pp b/manifests/wsgi/apache_api.pp index 5e2180f7c..27a3055fa 100644 --- a/manifests/wsgi/apache_api.pp +++ b/manifests/wsgi/apache_api.pp @@ -123,11 +123,11 @@ class nova::wsgi::apache_api ( $custom_wsgi_process_options = {}, ) { - include ::nova::params - include ::apache - include ::apache::mod::wsgi + include nova::params + include apache + include apache::mod::wsgi if $ssl { - include ::apache::mod::ssl + include apache::mod::ssl } if ! defined(Class[::nova::api]) { diff --git a/manifests/wsgi/apache_metadata.pp b/manifests/wsgi/apache_metadata.pp index 012047a66..6ea137cc7 100644 --- a/manifests/wsgi/apache_metadata.pp +++ b/manifests/wsgi/apache_metadata.pp @@ -110,11 +110,11 @@ class nova::wsgi::apache_metadata ( $custom_wsgi_process_options = {}, ) { - include ::nova::params - include ::apache - include ::apache::mod::wsgi + include nova::params + include apache + include apache::mod::wsgi if $ssl { - include ::apache::mod::ssl + include apache::mod::ssl } nova::generic_service { 'metadata-api': diff --git a/spec/acceptance/nova_wsgi_apache_spec.rb b/spec/acceptance/nova_wsgi_apache_spec.rb index 56e4420b6..e4b02847b 100644 --- a/spec/acceptance/nova_wsgi_apache_spec.rb +++ b/spec/acceptance/nova_wsgi_apache_spec.rb @@ -6,14 +6,14 @@ describe 'basic nova' 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::neutron - include ::openstack_integration::placement - include ::openstack_integration::nova + include openstack_integration + include openstack_integration::repos + include openstack_integration::rabbitmq + include openstack_integration::mysql + include openstack_integration::keystone + include openstack_integration::neutron + include openstack_integration::placement + include openstack_integration::nova nova_aggregate { 'test_aggregate': ensure => present, diff --git a/spec/classes/nova_api_spec.rb b/spec/classes/nova_api_spec.rb index 16b1c071f..e032ee1b0 100644 --- a/spec/classes/nova_api_spec.rb +++ b/spec/classes/nova_api_spec.rb @@ -4,7 +4,7 @@ describe 'nova::api' do let :pre_condition do "include nova - class { '::nova::keystone::authtoken': + class { 'nova::keystone::authtoken': password => 'passw0rd', }" end @@ -176,7 +176,7 @@ describe 'nova::api' do context 'with default database parameters' do let :pre_condition do "include nova - class { '::nova::keystone::authtoken': + class { 'nova::keystone::authtoken': password => 'a_big_secret', }" end @@ -197,7 +197,7 @@ describe 'nova::api' do api_slave_connection => 'mysql://user:pass@slave/db2', database_idle_timeout => '30', } - class { '::nova::keystone::authtoken': + class { 'nova::keystone::authtoken': password => 'passw0rd', } " @@ -229,9 +229,9 @@ describe 'nova::api' do end let :pre_condition do - "include ::apache - include ::nova - class { '::nova::keystone::authtoken': + "include apache + include nova + class { 'nova::keystone::authtoken': password => 'a_big_secret', }" end @@ -257,9 +257,9 @@ describe 'nova::api' do end let :pre_condition do - "include ::apache - include ::nova - class { '::nova::keystone::authtoken': + "include apache + include nova + class { 'nova::keystone::authtoken': password => 'a_big_secret', }" end @@ -282,9 +282,9 @@ describe 'nova::api' do end let :pre_condition do - "include ::apache - include ::nova - class { '::nova::keystone::authtoken': + "include apache + include nova + class { 'nova::keystone::authtoken': password => 'a_big_secret', }" end @@ -315,9 +315,9 @@ describe 'nova::api' do end let :pre_condition do - "include ::apache - include ::nova - class { '::nova::keystone::authtoken': + "include apache + include nova + class { 'nova::keystone::authtoken': password => 'a_big_secret', }" end diff --git a/spec/classes/nova_keystone_auth_spec.rb b/spec/classes/nova_keystone_auth_spec.rb index 7c2e9d4a7..e284ea3c5 100644 --- a/spec/classes/nova_keystone_auth_spec.rb +++ b/spec/classes/nova_keystone_auth_spec.rb @@ -152,7 +152,7 @@ describe 'nova::keystone::auth' do context 'when configuring nova-api and the keystone endpoint' do let :pre_condition do - "class { '::nova::keystone::authtoken': + "class { 'nova::keystone::authtoken': password => 'secrete', } class { 'nova::api': } diff --git a/spec/classes/nova_metadata_novajoin_api_spec.rb b/spec/classes/nova_metadata_novajoin_api_spec.rb index c588843fb..72a240ca7 100644 --- a/spec/classes/nova_metadata_novajoin_api_spec.rb +++ b/spec/classes/nova_metadata_novajoin_api_spec.rb @@ -29,8 +29,8 @@ describe 'nova::metadata::novajoin::api' do end let :pre_condition do - "class { '::ipaclient': password => 'join_otp', } - class { '::nova::metadata::novajoin::authtoken': + "class { 'ipaclient': password => 'join_otp', } + class { 'nova::metadata::novajoin::authtoken': password => 'passw0rd', }" end diff --git a/spec/classes/nova_metadata_novajoin_auth_spec.rb b/spec/classes/nova_metadata_novajoin_auth_spec.rb index 3be6ef415..4e12d60fd 100644 --- a/spec/classes/nova_metadata_novajoin_auth_spec.rb +++ b/spec/classes/nova_metadata_novajoin_auth_spec.rb @@ -128,11 +128,11 @@ describe 'nova::metadata::novajoin::auth' do context 'when configuring novajoin and the keystone endpoint' do let :pre_condition do - "class { '::nova::metadata::novajoin::authtoken': + "class { 'nova::metadata::novajoin::authtoken': password => 'secrete', } - class { '::ipaclient': password => 'join_otp', } - class { '::nova::metadata::novajoin::api': + class { 'ipaclient': password => 'join_otp', } + class { 'nova::metadata::novajoin::api': service_password => 'secrete', transport_url => 'rabbit://127.0.0.1//', }" diff --git a/spec/classes/nova_metadata_spec.rb b/spec/classes/nova_metadata_spec.rb index 345b432d7..d442038e8 100644 --- a/spec/classes/nova_metadata_spec.rb +++ b/spec/classes/nova_metadata_spec.rb @@ -4,7 +4,7 @@ describe 'nova::metadata' do let :pre_condition do "include nova - class { '::nova::keystone::authtoken': + class { 'nova::keystone::authtoken': password => 'passw0rd', }" end @@ -53,7 +53,7 @@ describe 'nova::metadata' do context 'with default database parameters' do let :pre_condition do "include nova - class { '::nova::keystone::authtoken': + class { 'nova::keystone::authtoken': password => 'a_big_secret', }" end @@ -74,7 +74,7 @@ describe 'nova::metadata' do api_slave_connection => 'mysql://user:pass@slave/db2', database_idle_timeout => '30', } - class { '::nova::keystone::authtoken': + class { 'nova::keystone::authtoken': password => 'passw0rd', } " diff --git a/spec/classes/nova_wsgi_apache_api_spec.rb b/spec/classes/nova_wsgi_apache_api_spec.rb index 353f8ea94..d253e70c5 100644 --- a/spec/classes/nova_wsgi_apache_api_spec.rb +++ b/spec/classes/nova_wsgi_apache_api_spec.rb @@ -6,10 +6,10 @@ describe 'nova::wsgi::apache_api' do let :pre_condition do "include nova - class { '::nova::keystone::authtoken': + class { 'nova::keystone::authtoken': password => 'secrete', } - class { '::nova::api': + class { 'nova::api': service_name => 'httpd', }" end @@ -41,10 +41,10 @@ describe 'nova::wsgi::apache_api' do context 'when overriding parameters using different ports' do let :pre_condition do "include nova - class { '::nova::keystone::authtoken': + class { 'nova::keystone::authtoken': password => 'secrete', } - class { '::nova::api': + class { 'nova::api': service_name => 'httpd', }" end diff --git a/spec/fixtures/manifests/site.pp b/spec/fixtures/manifests/site.pp index f6d09072c..46bd78e77 100644 --- a/spec/fixtures/manifests/site.pp +++ b/spec/fixtures/manifests/site.pp @@ -1,6 +1,6 @@ node default {} node 'test-001.example.org' { - include ::nova - include ::nova::spicehtml5proxy + include nova + include nova::spicehtml5proxy }