diff --git a/examples/init.pp b/examples/init.pp index b91e65aa..595b60b7 100644 --- a/examples/init.pp +++ b/examples/init.pp @@ -9,4 +9,4 @@ # Learn more about module testing here: # https://puppet.com/docs/puppet/latest/bgtm.html#testing-your-module # -include ::octavia +include octavia diff --git a/manifests/api.pp b/manifests/api.pp index 07cf3275..2a218e6d 100644 --- a/manifests/api.pp +++ b/manifests/api.pp @@ -85,12 +85,12 @@ class octavia::api ( $ovn_nb_connection = $::os_service_default, ) inherits octavia::params { - include ::octavia::deps - include ::octavia::policy - include ::octavia::db + include octavia::deps + include octavia::policy + include octavia::db if $auth_strategy == 'keystone' { - include ::octavia::keystone::authtoken + include octavia::keystone::authtoken } package { 'octavia-api': @@ -116,7 +116,7 @@ class octavia::api ( tag => ['octavia-service', 'octavia-db-sync-service'], } } elsif $service_name == 'httpd' { - include ::apache::params + include apache::params service { 'octavia-api': ensure => 'stopped', name => $::octavia::params::api_service_name, @@ -129,7 +129,7 @@ class octavia::api ( } if $sync_db { - include ::octavia::db::sync + include octavia::db::sync } octavia_config { diff --git a/manifests/certificates.pp b/manifests/certificates.pp index 813e41f1..1c7281dd 100644 --- a/manifests/certificates.pp +++ b/manifests/certificates.pp @@ -92,7 +92,7 @@ class octavia::certificates ( $file_permission_group = 'octavia' ) { - include ::octavia::deps + include octavia::deps $client_ca_real = pick($client_ca, $ca_certificate) diff --git a/manifests/client.pp b/manifests/client.pp index 5a02f714..efbdadd7 100644 --- a/manifests/client.pp +++ b/manifests/client.pp @@ -11,8 +11,8 @@ class octavia::client ( $ensure = 'present' ) { - include ::octavia::deps - include ::octavia::params + include octavia::deps + include octavia::params if $::octavia::params::client_package_name { package { 'python-octaviaclient': diff --git a/manifests/config.pp b/manifests/config.pp index 7df1192d..37447b0b 100644 --- a/manifests/config.pp +++ b/manifests/config.pp @@ -24,7 +24,7 @@ class octavia::config ( $octavia_config = {}, ) { - include ::octavia::deps + include octavia::deps validate_legacy(Hash, 'validate_hash', $octavia_config) diff --git a/manifests/controller.pp b/manifests/controller.pp index 76509f27..110dd2bd 100644 --- a/manifests/controller.pp +++ b/manifests/controller.pp @@ -197,8 +197,8 @@ class octavia::controller ( $anti_affinity_policy = $::os_service_default, ) inherits octavia::params { - include ::octavia::deps - include ::octavia::db + include octavia::deps + include octavia::db # For backward compatibility $amp_flavor_id_real = pick($::octavia::worker::amp_flavor_id, $amp_flavor_id) diff --git a/manifests/db.pp b/manifests/db.pp index 786a0c98..39427d19 100644 --- a/manifests/db.pp +++ b/manifests/db.pp @@ -62,7 +62,7 @@ class octavia::db ( $database_idle_timeout = undef, ) { - include ::octavia::deps + include octavia::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 4bab1722..e75c6774 100644 --- a/manifests/db/mysql.pp +++ b/manifests/db/mysql.pp @@ -43,7 +43,7 @@ class octavia::db::mysql( $allowed_hosts = undef ) { - include ::octavia::deps + include octavia::deps validate_legacy(String, 'validate_string', $password) diff --git a/manifests/db/postgresql.pp b/manifests/db/postgresql.pp index c9580a52..40242d9c 100644 --- a/manifests/db/postgresql.pp +++ b/manifests/db/postgresql.pp @@ -32,7 +32,7 @@ class octavia::db::postgresql( $privileges = 'ALL', ) { - include ::octavia::deps + include octavia::deps ::openstacklib::db::postgresql { 'octavia': password_hash => postgresql_password($user, $password), diff --git a/manifests/db/sync.pp b/manifests/db/sync.pp index f47d1062..83fbdc8e 100644 --- a/manifests/db/sync.pp +++ b/manifests/db/sync.pp @@ -12,7 +12,7 @@ class octavia::db::sync( $extra_params = undef, ) { - include ::octavia::deps + include octavia::deps exec { 'octavia-db-sync': command => "octavia-db-manage upgrade head ${extra_params}", diff --git a/manifests/glance.pp b/manifests/glance.pp index 25c3d46f..6f52f1a3 100644 --- a/manifests/glance.pp +++ b/manifests/glance.pp @@ -27,7 +27,7 @@ class octavia::glance ( $endpoint_type = $::os_service_default, ) { - include ::octavia::deps + include octavia::deps octavia_config { 'glance/service_name': value => $service_name; diff --git a/manifests/health_manager.pp b/manifests/health_manager.pp index 4c8db5b9..906edb55 100644 --- a/manifests/health_manager.pp +++ b/manifests/health_manager.pp @@ -48,7 +48,7 @@ class octavia::health_manager ( ) inherits octavia::params { - include ::octavia::deps + include octavia::deps validate_legacy(String, 'validate_string', $heartbeat_key) diff --git a/manifests/housekeeping.pp b/manifests/housekeeping.pp index aa691a71..60a96bae 100644 --- a/manifests/housekeeping.pp +++ b/manifests/housekeeping.pp @@ -68,7 +68,7 @@ class octavia::housekeeping ( $spare_amphorae_pool_size = undef ) inherits octavia::params { - include ::octavia::deps + include octavia::deps if $spare_amphorae_pool_size { warning('spare_amphorae_pool_size is deprecated and will be removed in the future. Please use spare_amphora_pool_size.') diff --git a/manifests/init.pp b/manifests/init.pp index 53012669..8c6f9ec1 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -272,8 +272,8 @@ class octavia ( $database_db_max_retries = undef, ) inherits octavia::params { - include ::octavia::deps - include ::octavia::db + include octavia::deps + include octavia::db package { 'octavia': ensure => $package_ensure, diff --git a/manifests/keystone/auth.pp b/manifests/keystone/auth.pp index 09deca5f..f864b99c 100644 --- a/manifests/keystone/auth.pp +++ b/manifests/keystone/auth.pp @@ -79,7 +79,7 @@ class octavia::keystone::auth ( $internal_url = 'http://127.0.0.1:9876', ) { - include ::octavia::deps + include octavia::deps keystone::resource::service_identity { 'octavia': configure_user => $configure_user, diff --git a/manifests/keystone/authtoken.pp b/manifests/keystone/authtoken.pp index bafac4ef..e83f9861 100644 --- a/manifests/keystone/authtoken.pp +++ b/manifests/keystone/authtoken.pp @@ -213,7 +213,7 @@ class octavia::keystone::authtoken( $service_token_roles_required = $::os_service_default, ) { - include ::octavia::deps + include octavia::deps keystone::resource::authtoken { 'octavia_config': username => $username, diff --git a/manifests/logging.pp b/manifests/logging.pp index d2b5bc90..86ac3eee 100644 --- a/manifests/logging.pp +++ b/manifests/logging.pp @@ -123,7 +123,7 @@ class octavia::logging( $log_date_format = $::os_service_default, ) { - include ::octavia::deps + include octavia::deps oslo::log { 'octavia_config': debug => $debug, diff --git a/manifests/neutron.pp b/manifests/neutron.pp index 44bab801..eed3f3e0 100644 --- a/manifests/neutron.pp +++ b/manifests/neutron.pp @@ -27,7 +27,7 @@ class octavia::neutron ( $endpoint_type = $::os_service_default, ) { - include ::octavia::deps + include octavia::deps octavia_config { 'neutron/service_name': value => $service_name; diff --git a/manifests/nova.pp b/manifests/nova.pp index 80cffcdd..2a97f5e2 100644 --- a/manifests/nova.pp +++ b/manifests/nova.pp @@ -43,7 +43,7 @@ class octavia::nova ( $anti_affinity_policy = $::os_service_default, ) { - include ::octavia::deps + include octavia::deps octavia_config { 'nova/service_name': value => $service_name; diff --git a/manifests/params.pp b/manifests/params.pp index 4c1a9cf9..6cf2eb5e 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -1,7 +1,7 @@ # Parameters for puppet-octavia # class octavia::params { - include ::openstacklib::defaults + include openstacklib::defaults $pyvers = $::openstacklib::defaults::pyvers $api_service_name = 'octavia-api' diff --git a/manifests/policy.pp b/manifests/policy.pp index 635c7674..80ce0ef2 100644 --- a/manifests/policy.pp +++ b/manifests/policy.pp @@ -28,8 +28,8 @@ class octavia::policy ( $policy_path = '/etc/octavia/policy.json', ) { - include ::octavia::deps - include ::octavia::params + include octavia::deps + include octavia::params validate_legacy(Hash, 'validate_hash', $policies) diff --git a/manifests/quota.pp b/manifests/quota.pp index 78b6e90a..449c4344 100644 --- a/manifests/quota.pp +++ b/manifests/quota.pp @@ -32,7 +32,7 @@ class octavia::quota ( $health_monitor_quota = $::os_service_default, ) { - include ::octavia::deps + include octavia::deps octavia_config { 'quotas/default_load_balancer_quota': value => $load_balancer_quota; diff --git a/manifests/service_auth.pp b/manifests/service_auth.pp index 4cd511d1..719360a4 100644 --- a/manifests/service_auth.pp +++ b/manifests/service_auth.pp @@ -42,7 +42,7 @@ class octavia::service_auth ( $auth_type = $::os_service_default, ) { - include ::octavia::deps + include octavia::deps octavia_config { 'service_auth/auth_url' : value => $auth_url; diff --git a/manifests/worker.pp b/manifests/worker.pp index b72e0e70..ff731e7e 100644 --- a/manifests/worker.pp +++ b/manifests/worker.pp @@ -133,10 +133,10 @@ class octavia::worker ( $timeout_tcp_inspect = undef, ) inherits octavia::params { - include ::octavia::deps + include octavia::deps if !defined(Class['octavia::controller']) { - include ::octavia::controller + include octavia::controller } if ($amp_flavor_id or $amp_image_tag or $amp_secgroup_list or $amp_boot_network_list or $loadbalancer_topology or $amphora_driver or diff --git a/manifests/wsgi/apache.pp b/manifests/wsgi/apache.pp index 0c15c772..ac1d838a 100644 --- a/manifests/wsgi/apache.pp +++ b/manifests/wsgi/apache.pp @@ -115,12 +115,12 @@ class octavia::wsgi::apache ( $custom_wsgi_process_options = {}, ) { - include ::octavia::deps - include ::octavia::params - include ::apache - include ::apache::mod::wsgi + include octavia::deps + include octavia::params + include apache + include apache::mod::wsgi if $ssl { - include ::apache::mod::ssl + include apache::mod::ssl } ::openstacklib::wsgi::apache { 'octavia_wsgi': bind_host => $bind_host, diff --git a/spec/acceptance/octavia_spec.rb b/spec/acceptance/octavia_spec.rb index cbdd8292..d8f0a81e 100644 --- a/spec/acceptance/octavia_spec.rb +++ b/spec/acceptance/octavia_spec.rb @@ -6,14 +6,14 @@ describe 'basic octavia' 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 + include openstack_integration::repos + include openstack_integration::rabbitmq + include openstack_integration::mysql + include openstack_integration::keystone if $::osfamily == 'RedHat' { - include ::openstack_integration::placement - include ::openstack_integration::nova + include openstack_integration::placement + include openstack_integration::nova } rabbitmq_user { 'octavia': @@ -31,37 +31,37 @@ describe 'basic octavia' do require => Class['rabbitmq'], } - class { '::octavia::db::mysql': + class { 'octavia::db::mysql': password => 'a_big_secret', } - class { '::octavia::keystone::auth': + class { 'octavia::keystone::auth': password => 'a_big_secret', } # Octavia is not packaged on Ubuntu platform. if $::osfamily == 'RedHat' { - class { '::octavia::db': + class { 'octavia::db': database_connection => 'mysql+pymysql://octavia:a_big_secret@127.0.0.1/octavia?charset=utf8', } - class { '::octavia::logging': + class { 'octavia::logging': debug => true, } - class { '::octavia': + class { 'octavia': default_transport_url => 'rabbit://octavia:an_even_bigger_secret@127.0.0.1:5672/', } - class { '::octavia::keystone::authtoken': + class { 'octavia::keystone::authtoken': password => 'octavia_pass', } - class { '::octavia::api': + class { 'octavia::api': sync_db => true, } - class { '::octavia::worker': + class { 'octavia::worker': amp_flavor_id => '65', } - class { '::octavia::health_manager': + class { 'octavia::health_manager': heartbeat_key => 'abcdefghijkl', } - class { '::octavia::housekeeping': + class { 'octavia::housekeeping': } # We create Nova flavor on the same node where Nova runs diff --git a/spec/classes/octavia_api_spec.rb b/spec/classes/octavia_api_spec.rb index 35d6baf4..9d95acf0 100644 --- a/spec/classes/octavia_api_spec.rb +++ b/spec/classes/octavia_api_spec.rb @@ -20,8 +20,8 @@ describe 'octavia::api' do shared_examples_for 'octavia-api' do let :pre_condition do "class { 'octavia': } - include ::octavia::db - class { '::octavia::keystone::authtoken': + include octavia::db + class { 'octavia::keystone::authtoken': password => 'password', } " @@ -119,11 +119,11 @@ describe 'octavia::api' do shared_examples 'octavia-api wsgi' do let :pre_condition do "class { 'octavia': } - include ::octavia::db - class { '::octavia::keystone::authtoken': + include octavia::db + class { 'octavia::keystone::authtoken': password => 'password', } - include ::apache + include apache " end