openstack
/
puppet-nova
Code Issues Proposed changes

Convert all class usage to relative names 

Change-Id: Ibe5a433cb67c38c0c9b05a50bffa2eda7391f241
This commit is contained in:
Tobias Urdin 2019-12-08 23:13:08 +01:00
parent 2716ce36e0
commit 7deecfbdf2
73 changed files with 175 additions and 175 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
examples/nova_with_pacemaker.pp
View File

@ -24,25 +24,25 @@
# sudo pcs constraint colocation add nova_api_service with nova_vip # sudo pcs constraint colocation add nova_api_service with nova_vip
# sudo pcs constraint colocation add nova_novncproxy_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, enabled => false,
manage_service => false, manage_service => false,
admin_password => 'PASSWORD', admin_password => 'PASSWORD',
} }
class { '::nova::conductor': class { 'nova::conductor':
enabled => false, enabled => false,
manage_service => false, manage_service => false,
} }
class { '::nova::scheduler': class { 'nova::scheduler':
enabled => false, enabled => false,
manage_service => false, manage_service => false,
} }
class { '::nova::vncproxy': class { 'nova::vncproxy':
enabled => false, enabled => false,
manage_service => false, manage_service => false,
} }

20
examples/nova_wsgi.pp
View File

@ -1,31 +1,31 @@
# This manifest documents different use cases when running WSGI in Nova API # 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 # Use Case #1: running Nova API with osapi_compute in WSGI, and metadata
class { '::nova': } class { 'nova': }
class { '::nova::api': class { 'nova::api':
admin_password => 'a_big_secret', admin_password => 'a_big_secret',
service_name => 'httpd', service_name => 'httpd',
} }
include ::apache include apache
class { '::nova::wsgi::apache': class { 'nova::wsgi::apache':
ssl => false, ssl => false,
} }
# Use Case #2: running Nova API with osapi_compute in WSGI, and metadata disabled # Use Case #2: running Nova API with osapi_compute in WSGI, and metadata disabled
class { '::nova': } class { 'nova': }
class { '::nova::api': class { 'nova::api':
admin_password => 'a_big_secret', admin_password => 'a_big_secret',
enabled_apis => ['osapi_compute'], enabled_apis => ['osapi_compute'],
service_name => 'httpd', service_name => 'httpd',
} }
include ::apache include apache
class { '::nova::wsgi::apache': class { 'nova::wsgi::apache':
ssl => false, ssl => false,
} }
# Use Case #3: not running osapi_compute, just enabling metadata # Use Case #3: not running osapi_compute, just enabling metadata
class { '::nova': } class { 'nova': }
class { '::nova::api': class { 'nova::api':
admin_password => 'a_big_secret', admin_password => 'a_big_secret',
enabled_apis => ['metadata'], enabled_apis => ['metadata'],
} }

18
manifests/api.pp
View File

@ -225,11 +225,11 @@ class nova::api(
$fping_path = undef, $fping_path = undef,
) inherits nova::params { ) inherits nova::params {
include ::nova::deps include nova::deps
include ::nova::db include nova::db
include ::nova::policy include nova::policy
include ::nova::keystone::authtoken include nova::keystone::authtoken
include ::nova::availability_zone include nova::availability_zone
if !$nova_metadata_wsgi_enabled { if !$nova_metadata_wsgi_enabled {
warning('Running nova metadata api via evenlet is deprecated and will be removed in Stein release.') 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 { if $install_cinder_client {
include ::cinder::client include cinder::client
Class['cinder::client'] ~> Nova::Generic_service['api'] 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 # Added arg and if statement prevents this from being run
# where db is not active i.e. the compute # where db is not active i.e. the compute
if $sync_db { if $sync_db {
include ::nova::db::sync include nova::db::sync
} }
if $sync_db_api { if $sync_db_api {
include ::nova::db::sync_api include nova::db::sync_api
} }
if $db_online_data_migrations { if $db_online_data_migrations {
include ::nova::db::online_data_migrations include nova::db::online_data_migrations
} }
# Remove auth configuration from api-paste.ini # Remove auth configuration from api-paste.ini

2
manifests/cache.pp
View File

@ -102,7 +102,7 @@ class nova::cache (
$manage_backend_package = true, $manage_backend_package = true,
) { ) {
include ::nova::deps include nova::deps
oslo::cache { 'nova_config': oslo::cache { 'nova_config':
config_prefix => $config_prefix, config_prefix => $config_prefix,

4
manifests/cell_v2/discover_hosts.pp
View File

@ -12,8 +12,8 @@ class nova::cell_v2::discover_hosts (
$extra_params = '', $extra_params = '',
) { ) {
include ::nova::deps include nova::deps
include ::nova::params include nova::params
exec { 'nova-cell_v2-discover_hosts': exec { 'nova-cell_v2-discover_hosts':
path => ['/bin', '/usr/bin'], path => ['/bin', '/usr/bin'],

4
manifests/cell_v2/map_cell0.pp
View File

@ -15,8 +15,8 @@ class nova::cell_v2::map_cell0 (
$extra_params = '', $extra_params = '',
) { ) {
include ::nova::deps include nova::deps
include ::nova::params include nova::params
exec { 'nova-cell_v2-map_cell0': exec { 'nova-cell_v2-map_cell0':
path => ['/bin', '/usr/bin'], path => ['/bin', '/usr/bin'],

4
manifests/cell_v2/map_cell_and_hosts.pp
View File

@ -12,8 +12,8 @@ class nova::cell_v2::map_cell_and_hosts (
$extra_params = '', $extra_params = '',
) { ) {
include ::nova::deps include nova::deps
include ::nova::params include nova::params
exec { 'nova-cell_v2-map_cell_and_hosts': exec { 'nova-cell_v2-map_cell_and_hosts':
path => ['/bin', '/usr/bin'], path => ['/bin', '/usr/bin'],

4
manifests/cell_v2/map_instances.pp
View File

@ -25,8 +25,8 @@ class nova::cell_v2::map_instances (
$extra_params = '', $extra_params = '',
) { ) {
include ::nova::deps include nova::deps
include ::nova::params include nova::params
if (!$cell_uuid and !$cell_name) { if (!$cell_uuid and !$cell_name) {
fail('Either cell_uuid or cell_name must be provided') fail('Either cell_uuid or cell_name must be provided')

6
manifests/cell_v2/simple_setup.pp
View File

@ -34,9 +34,9 @@ class nova::cell_v2::simple_setup (
$database_connection_cell0 = 'default', $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': nova_cell_v2 { 'cell0':
database_connection => $database_connection_cell0 database_connection => $database_connection_cell0
@ -47,7 +47,7 @@ class nova::cell_v2::simple_setup (
database_connection => $database_connection database_connection => $database_connection
} }
include ::nova::cell_v2::discover_hosts include nova::cell_v2::discover_hosts
Class['nova::cell_v2::map_cell0'] Class['nova::cell_v2::map_cell0']
-> Nova_cell_v2 <| |> -> Nova_cell_v2 <| |>

2
manifests/cinder.pp
View File

@ -61,7 +61,7 @@ class nova::cinder (
) { ) {
include ::nova::deps include nova::deps
nova_config { nova_config {
'cinder/password': value => $password, secret => true; 'cinder/password': value => $password, secret => true;

4
manifests/client.pp
View File

@ -11,8 +11,8 @@
class nova::client( class nova::client(
$ensure = 'present' $ensure = 'present'
) { ) {
include ::nova::deps include nova::deps
include ::nova::params include nova::params
package { 'python-novaclient': package { 'python-novaclient':
ensure => $ensure, ensure => $ensure,

14
manifests/compute.pp
View File

@ -241,15 +241,15 @@ class nova::compute (
$vcpu_pin_set = undef, $vcpu_pin_set = undef,
) { ) {
include ::nova::deps include nova::deps
include ::nova::params include nova::params
$cpu_shared_set_real = pick(join(any2array($cpu_shared_set), ','), $::os_service_default) $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) $cpu_dedicated_set_real = pick(join(any2array($cpu_dedicated_set), ','), $::os_service_default)
include ::nova::pci include nova::pci
include ::nova::compute::vgpu include nova::compute::vgpu
include ::nova::vendordata include nova::vendordata
if $vnc_keymap { if $vnc_keymap {
warning('vnc_keymap parameter is deprecated, has no effect and will be removed in the future.') 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 $reserved_huge_pages_real = $::os_service_default
} }
include ::nova::availability_zone include nova::availability_zone
nova_config { nova_config {
'DEFAULT/reserved_host_memory_mb': value => $reserved_host_memory; '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 }) ensure_resource('nova_config', 'DEFAULT/allow_resize_to_same_host', { value => $allow_resize_to_same_host })
if ($vnc_enabled) { if ($vnc_enabled) {
include ::nova::vncproxy::common include nova::vncproxy::common
nova_config { nova_config {
'vnc/server_proxyclient_address': value => $vncserver_proxyclient_address; 'vnc/server_proxyclient_address': value => $vncserver_proxyclient_address;

4
manifests/compute/ironic.pp
View File

@ -17,9 +17,9 @@ class nova::compute::ironic (
$compute_driver = 'ironic.IronicDriver' $compute_driver = 'ironic.IronicDriver'
) { ) {
include ::nova::deps include nova::deps
require ::nova::ironic::common require ::nova::ironic::common
include ::ironic::client include ironic::client
nova_config { nova_config {
'DEFAULT/compute_driver': value => $compute_driver; 'DEFAULT/compute_driver': value => $compute_driver;

10
manifests/compute/libvirt.pp
View File

@ -224,8 +224,8 @@ class nova::compute::libvirt (
$tls_priority = undef, $tls_priority = undef,
) inherits nova::params { ) inherits nova::params {
include ::nova::deps include nova::deps
include ::nova::params include nova::params
# libvirt_cpu_mode has different defaults depending on hypervisor. # libvirt_cpu_mode has different defaults depending on hypervisor.
if !$libvirt_cpu_mode { if !$libvirt_cpu_mode {
@ -249,7 +249,7 @@ class nova::compute::libvirt (
} }
if $migration_support { if $migration_support {
include ::nova::migration::libvirt include nova::migration::libvirt
} }
if $log_outputs { if $log_outputs {
@ -283,7 +283,7 @@ class nova::compute::libvirt (
# #
# If you're using hiera: # If you're using hiera:
# - set nova::compute::libvirt::manage_libvirt_services to false # - 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 # - select which services you want to deploy with
# ::nova::compute::libvirt::services:* parameters. # ::nova::compute::libvirt::services:* parameters.
# #
@ -292,7 +292,7 @@ class nova::compute::libvirt (
# - select which services you want to deploy with # - select which services you want to deploy with
# ::nova::compute::libvirt::*_service_name parameters. # ::nova::compute::libvirt::*_service_name parameters.
if $manage_libvirt_services { if $manage_libvirt_services {
class { '::nova::compute::libvirt::services': class { 'nova::compute::libvirt::services':
libvirt_service_name => $libvirt_service_name, libvirt_service_name => $libvirt_service_name,
virtlock_service_name => $virtlock_service_name, virtlock_service_name => $virtlock_service_name,
virtlog_service_name => $virtlog_service_name, virtlog_service_name => $virtlog_service_name,

2
manifests/compute/libvirt/qemu.pp
View File

@ -54,7 +54,7 @@ class nova::compute::libvirt::qemu(
$libvirt_version = $::nova::compute::libvirt::version::default, $libvirt_version = $::nova::compute::libvirt::version::default,
) inherits nova::compute::libvirt::version { ) inherits nova::compute::libvirt::version {
include ::nova::deps include nova::deps
require ::nova::compute::libvirt require ::nova::compute::libvirt
Anchor['nova::config::begin'] Anchor['nova::config::begin']

4
manifests/compute/libvirt/services.pp
View File

@ -27,8 +27,8 @@ class nova::compute::libvirt::services (
$libvirt_virt_type = 'kvm', $libvirt_virt_type = 'kvm',
) inherits nova::params { ) inherits nova::params {
include ::nova::deps include nova::deps
include ::nova::params include nova::params
if $libvirt_service_name { if $libvirt_service_name {
# libvirt-nwfilter # libvirt-nwfilter

4
manifests/compute/libvirt_guests.pp
View File

@ -54,8 +54,8 @@ class nova::compute::libvirt_guests (
$on_shutdown = 'shutdown', $on_shutdown = 'shutdown',
$manage_service = false, $manage_service = false,
) { ) {
include ::nova::params include nova::params
include ::nova::deps include nova::deps
Anchor['nova::config::begin'] Anchor['nova::config::begin']
-> File_line<| tag == 'libvirt-guests-file_line'|> -> File_line<| tag == 'libvirt-guests-file_line'|>

2
manifests/compute/pci.pp
View File

@ -14,7 +14,7 @@
class nova::compute::pci( class nova::compute::pci(
$passthrough = $::os_service_default $passthrough = $::os_service_default
) { ) {
include ::nova::deps include nova::deps
$picked_passthrough = pick_default($::nova::compute::pci_passthrough,$passthrough) $picked_passthrough = pick_default($::nova::compute::pci_passthrough,$passthrough)

4
manifests/compute/rbd.pp
View File

@ -74,8 +74,8 @@ class nova::compute::rbd (
$ceph_client_ensure = 'present', $ceph_client_ensure = 'present',
) { ) {
include ::nova::deps include nova::deps
include ::nova::params include nova::params
if $manage_ceph_client { if $manage_ceph_client {
# Install ceph client libraries # Install ceph client libraries

2
manifests/compute/serial.pp
View File

@ -23,7 +23,7 @@ class nova::compute::serial(
$proxyclient_address = '127.0.0.1', $proxyclient_address = '127.0.0.1',
) { ) {
include ::nova::deps include nova::deps
nova_config { nova_config {
'serial_console/enabled': value => true; 'serial_console/enabled': value => true;

2
manifests/compute/spice.pp
View File

@ -51,7 +51,7 @@ class nova::compute::spice(
$keymap = undef, $keymap = undef,
) { ) {
include ::nova::deps include nova::deps
if $keymap { if $keymap {
warning('keymap parameter is deprecated, has no effect and will be removed in the future.') warning('keymap parameter is deprecated, has no effect and will be removed in the future.')

2
manifests/compute/vgpu.pp
View File

@ -12,7 +12,7 @@
class nova::compute::vgpu( class nova::compute::vgpu(
$enabled_vgpu_types = $::os_service_default $enabled_vgpu_types = $::os_service_default
) { ) {
include ::nova::deps include nova::deps
nova_config { nova_config {
'devices/enabled_vgpu_types': value => join(any2array($enabled_vgpu_types), ','); 'devices/enabled_vgpu_types': value => join(any2array($enabled_vgpu_types), ',');

2
manifests/compute/vmware.pp
View File

@ -72,7 +72,7 @@ class nova::compute::vmware(
$datastore_regex = $::os_service_default, $datastore_regex = $::os_service_default,
) { ) {
include ::nova::deps include nova::deps
nova_config { nova_config {
'DEFAULT/compute_driver': value => $compute_driver; 'DEFAULT/compute_driver': value => $compute_driver;

2
manifests/compute/xenserver.pp
View File

@ -273,7 +273,7 @@ class nova::compute::xenserver(
$introduce_vdi_retry_wait = $::os_service_default, $introduce_vdi_retry_wait = $::os_service_default,
) { ) {
include ::nova::deps include nova::deps
nova_config { nova_config {
'DEFAULT/compute_driver': value => $compute_driver; 'DEFAULT/compute_driver': value => $compute_driver;

10
manifests/conductor.pp
View File

@ -35,11 +35,11 @@ class nova::conductor(
$enable_new_services = $::os_service_default, $enable_new_services = $::os_service_default,
) { ) {
include ::nova::deps include nova::deps
include ::nova::db include nova::db
include ::nova::params include nova::params
include ::nova::workarounds include nova::workarounds
include ::nova::availability_zone include nova::availability_zone
nova::generic_service { 'conductor': nova::generic_service { 'conductor':
enabled => $enabled, enabled => $enabled,

2
manifests/config.pp
View File

@ -32,7 +32,7 @@ class nova::config (
$nova_paste_api_ini = {}, $nova_paste_api_ini = {},
) { ) {
include ::nova::deps include nova::deps
validate_legacy(Hash, 'validate_hash', $nova_config) validate_legacy(Hash, 'validate_hash', $nova_config)
validate_legacy(Hash, 'validate_hash', $nova_paste_api_ini) validate_legacy(Hash, 'validate_hash', $nova_paste_api_ini)

2
manifests/cors.pp
View File

@ -45,7 +45,7 @@ class nova::cors (
$allow_headers = $::os_service_default, $allow_headers = $::os_service_default,
) { ) {
include ::nova::deps include nova::deps
oslo::cors { 'nova_config': oslo::cors { 'nova_config':
allowed_origin => $allowed_origin, allowed_origin => $allowed_origin,

4
manifests/cron/archive_deleted_rows.pp
View File

@ -92,8 +92,8 @@ class nova::cron::archive_deleted_rows (
$age = undef, $age = undef,
) { ) {
include ::nova::deps include nova::deps
include ::nova::params include nova::params
if $until_complete { if $until_complete {
$until_complete_real = '--until-complete' $until_complete_real = '--until-complete'

4
manifests/cron/purge_shadow_tables.pp
View File

@ -75,8 +75,8 @@ class nova::cron::purge_shadow_tables (
$maxdelay = 0, $maxdelay = 0,
) { ) {
include ::nova::deps include nova::deps
include ::nova::params include nova::params
if $verbose { if $verbose {
$verbose_real = '--verbose' $verbose_real = '--verbose'

4
manifests/db.pp
View File

@ -94,8 +94,8 @@ class nova::db (
$database_idle_timeout = undef, $database_idle_timeout = undef,
) { ) {
include ::nova::deps include nova::deps
include ::nova::params include nova::params
if $database_idle_timeout { if $database_idle_timeout {
warning('The database_idle_timeout parameter is deprecated. Please use \ warning('The database_idle_timeout parameter is deprecated. Please use \

2
manifests/db/mysql.pp
View File

@ -47,7 +47,7 @@ class nova::db::mysql(
$setup_cell0 = true, $setup_cell0 = true,
) { ) {
include ::nova::deps include nova::deps
::openstacklib::db::mysql { 'nova': ::openstacklib::db::mysql { 'nova':
user => $user, user => $user,

2
manifests/db/mysql_api.pp
View File

@ -41,7 +41,7 @@ class nova::db::mysql_api(
$allowed_hosts = undef, $allowed_hosts = undef,
) { ) {
include ::nova::deps include nova::deps
::openstacklib::db::mysql { 'nova_api': ::openstacklib::db::mysql { 'nova_api':
user => $user, user => $user,

4
manifests/db/online_data_migrations.pp
View File

@ -18,8 +18,8 @@ class nova::db::online_data_migrations(
$db_sync_timeout = 300, $db_sync_timeout = 300,
) { ) {
include ::nova::deps include nova::deps
include ::nova::params include nova::params
exec { 'nova-db-online-data-migrations': exec { 'nova-db-online-data-migrations':
command => "/usr/bin/nova-manage ${extra_params} db online_data_migrations", command => "/usr/bin/nova-manage ${extra_params} db online_data_migrations",

2
manifests/db/postgresql.pp
View File

@ -38,7 +38,7 @@ class nova::db::postgresql(
$setup_cell0 = true, $setup_cell0 = true,
) { ) {
include ::nova::deps include nova::deps
::openstacklib::db::postgresql { 'nova': ::openstacklib::db::postgresql { 'nova':
password_hash => postgresql_password($user, $password), password_hash => postgresql_password($user, $password),

2
manifests/db/postgresql_api.pp
View File

@ -32,7 +32,7 @@ class nova::db::postgresql_api(
$privileges = 'ALL', $privileges = 'ALL',
) { ) {
include ::nova::deps include nova::deps
::openstacklib::db::postgresql { 'nova_api': ::openstacklib::db::postgresql { 'nova_api':
password_hash => postgresql_password($user, $password), password_hash => postgresql_password($user, $password),

4
manifests/db/sync.pp
View File

@ -18,8 +18,8 @@ class nova::db::sync(
$db_sync_timeout = 300, $db_sync_timeout = 300,
) { ) {
include ::nova::deps include nova::deps
include ::nova::params include nova::params
exec { 'nova-db-sync': exec { 'nova-db-sync':
command => "/usr/bin/nova-manage ${extra_params} db sync", command => "/usr/bin/nova-manage ${extra_params} db sync",

6
manifests/db/sync_api.pp
View File

@ -27,8 +27,8 @@ class nova::db::sync_api(
$db_sync_timeout = 300, $db_sync_timeout = 300,
) { ) {
include ::nova::deps include nova::deps
include ::nova::params include nova::params
exec { 'nova-db-sync-api': exec { 'nova-db-sync-api':
command => "/usr/bin/nova-manage ${extra_params} api_db sync", command => "/usr/bin/nova-manage ${extra_params} api_db sync",
@ -49,6 +49,6 @@ class nova::db::sync_api(
} }
if $cellv2_setup { if $cellv2_setup {
include ::nova::cell_v2::simple_setup include nova::cell_v2::simple_setup
} }
} }

4
manifests/generic_service.pp
View File

@ -38,8 +38,8 @@ define nova::generic_service(
$ensure_package = 'present' $ensure_package = 'present'
) { ) {
include ::nova::deps include nova::deps
include ::nova::params include nova::params
$nova_title = "nova-${name}" $nova_title = "nova-${name}"

4
manifests/init.pp
View File

@ -514,10 +514,10 @@ class nova(
$notify_on_api_faults = undef, $notify_on_api_faults = undef,
) inherits nova::params { ) inherits nova::params {
include ::nova::deps include nova::deps
# maintain backward compatibility # maintain backward compatibility
include ::nova::db include nova::db
validate_legacy(Array, 'validate_array', $enabled_ssl_apis) validate_legacy(Array, 'validate_array', $enabled_ssl_apis)
if empty($enabled_ssl_apis) and $use_ssl { if empty($enabled_ssl_apis) and $use_ssl {

2
manifests/ironic/common.pp
View File

@ -51,7 +51,7 @@ class nova::ironic::common (
$project_domain_name = 'Default', $project_domain_name = 'Default',
) { ) {
include ::nova::deps include nova::deps
nova_config { nova_config {
'ironic/auth_plugin': value => $auth_plugin; 'ironic/auth_plugin': value => $auth_plugin;

2
manifests/keystone/auth.pp
View File

@ -76,7 +76,7 @@ class nova::keystone::auth(
$configure_user_role = true, $configure_user_role = true,
) { ) {
include ::nova::deps include nova::deps
if $configure_endpoint { if $configure_endpoint {

2
manifests/keystone/authtoken.pp
View File

@ -214,7 +214,7 @@ class nova::keystone::authtoken(
$service_token_roles_required = $::os_service_default, $service_token_roles_required = $::os_service_default,
) { ) {
include ::nova::deps include nova::deps
if is_service_default($password) { if is_service_default($password) {
fail('Please set password for nova service user') fail('Please set password for nova service user')

2
manifests/keystone/service_user.pp
View File

@ -80,7 +80,7 @@ class nova::keystone::service_user(
$region_name = $::os_service_default, $region_name = $::os_service_default,
) { ) {
include ::nova::deps include nova::deps
keystone::resource::service_user { 'nova_config': keystone::resource::service_user { 'nova_config':
username => $username, username => $username,

4
manifests/logging.pp
View File

@ -119,8 +119,8 @@ class nova::logging(
$log_date_format = $::os_service_default, $log_date_format = $::os_service_default,
) { ) {
include ::nova::deps include nova::deps
include ::nova::params include nova::params
if !is_service_default($log_dir) { if !is_service_default($log_dir) {
# This should force an update the selinux role if the logfile exists. # This should force an update the selinux role if the logfile exists.

2
manifests/manage/floating.pp
View File

@ -7,7 +7,7 @@
# #
define nova::manage::floating ( $network ) { define nova::manage::floating ( $network ) {
include ::nova::deps include nova::deps
nova_floating { $name: nova_floating { $name:
ensure => present, ensure => present,

6
manifests/metadata.pp
View File

@ -54,9 +54,9 @@ class nova::metadata(
$max_request_body_size = undef, $max_request_body_size = undef,
) inherits nova::params { ) inherits nova::params {
include ::nova::deps include nova::deps
include ::nova::db include nova::db
include ::nova::keystone::authtoken include nova::keystone::authtoken
if $enabled_apis != undef { if $enabled_apis != undef {
warning('enabled_apis parameter is deprecated, use nova::compute::enabled_apis instead.') warning('enabled_apis parameter is deprecated, use nova::compute::enabled_apis instead.')

4
manifests/metadata/novajoin/api.pp
View File

@ -127,8 +127,8 @@ class nova::metadata::novajoin::api (
$configure_kerberos = false, $configure_kerberos = false,
$ipa_realm = undef, $ipa_realm = undef,
) { ) {
include ::nova::metadata::novajoin::authtoken include nova::metadata::novajoin::authtoken
include ::nova::metadata::novajoin::policy include nova::metadata::novajoin::policy
if ! $service_user { if ! $service_user {
fail('service_user is missing') fail('service_user is missing')

2
manifests/migration/libvirt.pp
View File

@ -107,7 +107,7 @@ class nova::migration::libvirt(
$crl_file = undef, $crl_file = undef,
){ ){
include ::nova::deps include nova::deps
if $transport { if $transport {
$transport_real = $transport $transport_real = $transport

2
manifests/migration/qemu.pp
View File

@ -22,7 +22,7 @@ class nova::migration::qemu(
$migration_port_max = 49215, $migration_port_max = 49215,
){ ){
include ::nova::deps include nova::deps
Anchor['nova::config::begin'] Anchor['nova::config::begin']
-> Augeas<| tag == 'qemu-conf-augeas'|> -> Augeas<| tag == 'qemu-conf-augeas'|>

2
manifests/network/neutron.pp
View File

@ -124,7 +124,7 @@ class nova::network::neutron (
$dhcp_domain = undef, $dhcp_domain = undef,
) { ) {
include ::nova::deps include nova::deps
if $neutron_url { if $neutron_url {
warning('nova::network::neutron::neutron_url is deprecated, nova behaviour will be default to looking up \ warning('nova::network::neutron::neutron_url is deprecated, nova behaviour will be default to looking up \

2
manifests/params.pp
View File

@ -3,7 +3,7 @@
# These parameters need to be accessed from several locations and # These parameters need to be accessed from several locations and
# should be considered to be constant # should be considered to be constant
class nova::params { class nova::params {
include ::openstacklib::defaults include openstacklib::defaults
$pyvers = $::openstacklib::defaults::pyvers $pyvers = $::openstacklib::defaults::pyvers
$client_package = "python${pyvers}-novaclient" $client_package = "python${pyvers}-novaclient"
$group = 'nova' $group = 'nova'

2
manifests/patch/config.pp
View File

@ -17,7 +17,7 @@ class nova::patch::config (
$monkey_patch_modules = $::os_service_default, $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) $monkey_patch_modules_real = pick(join(any2array($monkey_patch_modules), ','), $::os_service_default)

2
manifests/pci.pp
View File

@ -14,7 +14,7 @@
class nova::pci( class nova::pci(
$aliases = $::os_service_default $aliases = $::os_service_default
) { ) {
include ::nova::deps include nova::deps
if $aliases and if $aliases and
!is_service_default($aliases) and !is_service_default($aliases) and

2
manifests/placement.pp
View File

@ -69,7 +69,7 @@ class nova::placement(
$os_interface = undef, $os_interface = undef,
) inherits nova::params { ) inherits nova::params {
include ::nova::deps include nova::deps
if $os_interface { if $os_interface {
warning('nova::placement::os_interface is deprecated for removal, please use valid_interfaces instead.') warning('nova::placement::os_interface is deprecated for removal, please use valid_interfaces instead.')

4
manifests/policy.pp
View File

@ -28,8 +28,8 @@ class nova::policy (
$policy_path = '/etc/nova/policy.json', $policy_path = '/etc/nova/policy.json',
) { ) {
include ::nova::deps include nova::deps
include ::nova::params include nova::params
validate_legacy(Hash, 'validate_hash', $policies) validate_legacy(Hash, 'validate_hash', $policies)

2
manifests/quota.pp
View File

@ -92,7 +92,7 @@ class nova::quota(
$max_age = 0, $max_age = 0,
) { ) {
include ::nova::deps include nova::deps
nova_config { nova_config {
'quota/instances': value => $instances; 'quota/instances': value => $instances;

8
manifests/scheduler.pp
View File

@ -58,10 +58,10 @@ class nova::scheduler(
$max_placement_results = $::os_service_default, $max_placement_results = $::os_service_default,
) { ) {
include ::nova::deps include nova::deps
include ::nova::db include nova::db
include ::nova::params include nova::params
include ::nova::availability_zone include nova::availability_zone
nova::generic_service { 'scheduler': nova::generic_service { 'scheduler':
enabled => $enabled, enabled => $enabled,

2
manifests/scheduler/filter.pp
View File

@ -134,7 +134,7 @@ class nova::scheduler::filter (
$scheduler_host_manager = undef, $scheduler_host_manager = undef,
) { ) {
include ::nova::deps include nova::deps
# The following values are following this rule: # The following values are following this rule:
# - default is $::os_service_default so Puppet won't try to configure it. # - default is $::os_service_default so Puppet won't try to configure it.

4
manifests/serialproxy.pp
View File

@ -32,8 +32,8 @@ class nova::serialproxy(
$ensure_package = 'present' $ensure_package = 'present'
) { ) {
include ::nova::deps include nova::deps
include ::nova::params include nova::params
nova_config { nova_config {
'serial_console/serialproxy_port': value => $serialproxy_port; 'serial_console/serialproxy_port': value => $serialproxy_port;

4
manifests/spicehtml5proxy.pp
View File

@ -36,8 +36,8 @@ class nova::spicehtml5proxy(
$ensure_package = 'present' $ensure_package = 'present'
) { ) {
include ::nova::deps include nova::deps
include ::nova::params include nova::params
# Nodes running spicehtml5proxy do *not* need (and in fact, don't care) # Nodes running spicehtml5proxy do *not* need (and in fact, don't care)
# about [spice]/enable to be set. This setting is for compute nodes, # about [spice]/enable to be set. This setting is for compute nodes,

2
manifests/vendordata.pp
View File

@ -96,7 +96,7 @@ class nova::vendordata(
# DEPRECATED # DEPRECATED
$vendordata_caller = undef, $vendordata_caller = undef,
) inherits nova::params { ) inherits nova::params {
include ::nova::deps include nova::deps
# TODO(mschuppert): In order to keep backward compatibility we rely on the # TODO(mschuppert): In order to keep backward compatibility we rely on the
# pick function. When vendordata parameters got removed from ::nova::api and # pick function. When vendordata parameters got removed from ::nova::api and

4
manifests/vncproxy.pp
View File

@ -76,8 +76,8 @@ class nova::vncproxy(
$vencrypt_ca = undef, $vencrypt_ca = undef,
) { ) {
include ::nova::deps include nova::deps
include ::nova::params include nova::params
if (!$allow_noauth and !$allow_vencrypt) { if (!$allow_noauth and !$allow_vencrypt) {
fail('Either allow_noauth or allow_vencrypt must be true') fail('Either allow_noauth or allow_vencrypt must be true')

2
manifests/vncproxy/common.pp
View File

@ -23,7 +23,7 @@ class nova::vncproxy::common (
$vncproxy_path = undef, $vncproxy_path = undef,
) { ) {
include ::nova::deps include nova::deps
if defined('$::nova::compute::vncproxy_host') { if defined('$::nova::compute::vncproxy_host') {
$compute_vncproxy_host_real = $::nova::compute::vncproxy_host $compute_vncproxy_host_real = $::nova::compute::vncproxy_host

8
manifests/wsgi/apache_api.pp
View File

@ -123,11 +123,11 @@ class nova::wsgi::apache_api (
$custom_wsgi_process_options = {}, $custom_wsgi_process_options = {},
) { ) {
include ::nova::params include nova::params
include ::apache include apache
include ::apache::mod::wsgi include apache::mod::wsgi
if $ssl { if $ssl {
include ::apache::mod::ssl include apache::mod::ssl
} }
if ! defined(Class[::nova::api]) { if ! defined(Class[::nova::api]) {

8
manifests/wsgi/apache_metadata.pp
View File

@ -110,11 +110,11 @@ class nova::wsgi::apache_metadata (
$custom_wsgi_process_options = {}, $custom_wsgi_process_options = {},
) { ) {
include ::nova::params include nova::params
include ::apache include apache
include ::apache::mod::wsgi include apache::mod::wsgi
if $ssl { if $ssl {
include ::apache::mod::ssl include apache::mod::ssl
} }
nova::generic_service { 'metadata-api': nova::generic_service { 'metadata-api':

16
spec/acceptance/nova_wsgi_apache_spec.rb
View File

@ -6,14 +6,14 @@ describe 'basic nova' do
it 'should work with no errors' do it 'should work with no errors' do
pp= <<-EOS pp= <<-EOS
include ::openstack_integration include openstack_integration
include ::openstack_integration::repos include openstack_integration::repos
include ::openstack_integration::rabbitmq include openstack_integration::rabbitmq
include ::openstack_integration::mysql include openstack_integration::mysql
include ::openstack_integration::keystone include openstack_integration::keystone
include ::openstack_integration::neutron include openstack_integration::neutron
include ::openstack_integration::placement include openstack_integration::placement
include ::openstack_integration::nova include openstack_integration::nova
nova_aggregate { 'test_aggregate': nova_aggregate { 'test_aggregate':
ensure => present, ensure => present,

30
spec/classes/nova_api_spec.rb
View File

@ -4,7 +4,7 @@ describe 'nova::api' do
let :pre_condition do let :pre_condition do
"include nova "include nova
class { '::nova::keystone::authtoken': class { 'nova::keystone::authtoken':
password => 'passw0rd', password => 'passw0rd',
}" }"
end end
@ -176,7 +176,7 @@ describe 'nova::api' do
context 'with default database parameters' do context 'with default database parameters' do
let :pre_condition do let :pre_condition do
"include nova "include nova
class { '::nova::keystone::authtoken': class { 'nova::keystone::authtoken':
password => 'a_big_secret', password => 'a_big_secret',
}" }"
end end
@ -197,7 +197,7 @@ describe 'nova::api' do
api_slave_connection => 'mysql://user:pass@slave/db2', api_slave_connection => 'mysql://user:pass@slave/db2',
database_idle_timeout => '30', database_idle_timeout => '30',
} }
class { '::nova::keystone::authtoken': class { 'nova::keystone::authtoken':
password => 'passw0rd', password => 'passw0rd',
} }
" "
@ -229,9 +229,9 @@ describe 'nova::api' do
end end
let :pre_condition do let :pre_condition do
"include ::apache "include apache
include ::nova include nova
class { '::nova::keystone::authtoken': class { 'nova::keystone::authtoken':
password => 'a_big_secret', password => 'a_big_secret',
}" }"
end end
@ -257,9 +257,9 @@ describe 'nova::api' do
end end
let :pre_condition do let :pre_condition do
"include ::apache "include apache
include ::nova include nova
class { '::nova::keystone::authtoken': class { 'nova::keystone::authtoken':
password => 'a_big_secret', password => 'a_big_secret',
}" }"
end end
@ -282,9 +282,9 @@ describe 'nova::api' do
end end
let :pre_condition do let :pre_condition do
"include ::apache "include apache
include ::nova include nova
class { '::nova::keystone::authtoken': class { 'nova::keystone::authtoken':
password => 'a_big_secret', password => 'a_big_secret',
}" }"
end end
@ -315,9 +315,9 @@ describe 'nova::api' do
end end
let :pre_condition do let :pre_condition do
"include ::apache "include apache
include ::nova include nova
class { '::nova::keystone::authtoken': class { 'nova::keystone::authtoken':
password => 'a_big_secret', password => 'a_big_secret',
}" }"
end end

2
spec/classes/nova_keystone_auth_spec.rb
View File

@ -152,7 +152,7 @@ describe 'nova::keystone::auth' do
context 'when configuring nova-api and the keystone endpoint' do context 'when configuring nova-api and the keystone endpoint' do
let :pre_condition do let :pre_condition do
"class { '::nova::keystone::authtoken': "class { 'nova::keystone::authtoken':
password => 'secrete', password => 'secrete',
} }
class { 'nova::api': } class { 'nova::api': }

4
spec/classes/nova_metadata_novajoin_api_spec.rb
View File

@ -29,8 +29,8 @@ describe 'nova::metadata::novajoin::api' do
end end
let :pre_condition do let :pre_condition do
"class { '::ipaclient': password => 'join_otp', } "class { 'ipaclient': password => 'join_otp', }
class { '::nova::metadata::novajoin::authtoken': class { 'nova::metadata::novajoin::authtoken':
password => 'passw0rd', password => 'passw0rd',
}" }"
end end

6
spec/classes/nova_metadata_novajoin_auth_spec.rb
View File

@ -128,11 +128,11 @@ describe 'nova::metadata::novajoin::auth' do
context 'when configuring novajoin and the keystone endpoint' do context 'when configuring novajoin and the keystone endpoint' do
let :pre_condition do let :pre_condition do
"class { '::nova::metadata::novajoin::authtoken': "class { 'nova::metadata::novajoin::authtoken':
password => 'secrete', password => 'secrete',
} }
class { '::ipaclient': password => 'join_otp', } class { 'ipaclient': password => 'join_otp', }
class { '::nova::metadata::novajoin::api': class { 'nova::metadata::novajoin::api':
service_password => 'secrete', service_password => 'secrete',
transport_url => 'rabbit://127.0.0.1//', transport_url => 'rabbit://127.0.0.1//',
}" }"

6
spec/classes/nova_metadata_spec.rb
View File

@ -4,7 +4,7 @@ describe 'nova::metadata' do
let :pre_condition do let :pre_condition do
"include nova "include nova
class { '::nova::keystone::authtoken': class { 'nova::keystone::authtoken':
password => 'passw0rd', password => 'passw0rd',
}" }"
end end
@ -53,7 +53,7 @@ describe 'nova::metadata' do
context 'with default database parameters' do context 'with default database parameters' do
let :pre_condition do let :pre_condition do
"include nova "include nova
class { '::nova::keystone::authtoken': class { 'nova::keystone::authtoken':
password => 'a_big_secret', password => 'a_big_secret',
}" }"
end end
@ -74,7 +74,7 @@ describe 'nova::metadata' do
api_slave_connection => 'mysql://user:pass@slave/db2', api_slave_connection => 'mysql://user:pass@slave/db2',
database_idle_timeout => '30', database_idle_timeout => '30',
} }
class { '::nova::keystone::authtoken': class { 'nova::keystone::authtoken':
password => 'passw0rd', password => 'passw0rd',
} }
" "

8
spec/classes/nova_wsgi_apache_api_spec.rb
View File

@ -6,10 +6,10 @@ describe 'nova::wsgi::apache_api' do
let :pre_condition do let :pre_condition do
"include nova "include nova
class { '::nova::keystone::authtoken': class { 'nova::keystone::authtoken':
password => 'secrete', password => 'secrete',
} }
class { '::nova::api': class { 'nova::api':
service_name => 'httpd', service_name => 'httpd',
}" }"
end end
@ -41,10 +41,10 @@ describe 'nova::wsgi::apache_api' do
context 'when overriding parameters using different ports' do context 'when overriding parameters using different ports' do
let :pre_condition do let :pre_condition do
"include nova "include nova
class { '::nova::keystone::authtoken': class { 'nova::keystone::authtoken':
password => 'secrete', password => 'secrete',
} }
class { '::nova::api': class { 'nova::api':
service_name => 'httpd', service_name => 'httpd',
}" }"
end end

4
spec/fixtures/manifests/site.pp vendored
View File

@ -1,6 +1,6 @@
node default {} node default {}
node 'test-001.example.org' { node 'test-001.example.org' {
include ::nova include nova
include ::nova::spicehtml5proxy include nova::spicehtml5proxy
} }