openstack
/
puppet-sahara
Code Issues Proposed changes

Convert all class usage to relative names 

Change-Id: Ic331e369232810194f8840f2a6d3e46e711a0ad8
This commit is contained in:
Tobias Urdin 2019-12-08 23:20:49 +01:00
parent 6a14e2f8d6
commit 9361726846
20 changed files with 49 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
examples/basic.pp
View File

@ -1,5 +1,5 @@
# First, install a mysql server
class { '::mysql::server':
class { 'mysql::server':
# sahara documentation recommends this configuration.
override_options => {
'mysqld' => {
@ -16,12 +16,12 @@ class { '::mysql::server':
}
# Then, create a database
class { '::sahara::db::mysql':
class { 'sahara::db::mysql':
password => 'a_big_secret',
}
# Then the common class
class { '::sahara':
class { 'sahara':
database_connection => 'mysql+pymysql://sahara:a_big_secret@127.0.0.1:3306/sahara',
debug => true,
host => '0.0.0.0',
@ -30,12 +30,12 @@ class { '::sahara':
}
# Keystone authtoken parameters
class { '::sahara::keystone::authtoken':
class { 'sahara::keystone::authtoken':
password => 'a_big_secret',
}
# Setup API service in Apache
class { '::sahara::service::api':
class { 'sahara::service::api':
service_name => 'httpd',
}
@ -58,15 +58,15 @@ if ($::operatingsystem == 'Ubuntu') and (versioncmp($::operatingsystemmajrelease
-> File['/etc/apache2/sites-enabled/sahara-api.conf'] ~> Anchor['sahara::install::end']
}
include ::apache
class { '::sahara::wsgi::apache':
include apache
class { 'sahara::wsgi::apache':
workers => 2,
}
# Setup the engine service
class { '::sahara::service::engine': }
class { 'sahara::service::engine': }
# Finally, make it accessible
class { '::sahara::keystone::auth':
class { 'sahara::keystone::auth':
password => 'secrete',
}

4
manifests/client.pp
View File

@ -12,8 +12,8 @@ class sahara::client (
$package_ensure = 'present'
) {
include ::sahara::deps
include ::sahara::params
include sahara::deps
include sahara::params
package { 'python-saharaclient':
ensure => $package_ensure,

2
manifests/config.pp
View File

@ -28,7 +28,7 @@ class sahara::config (
$sahara_api_paste_ini = {},
) {
include ::sahara::deps
include sahara::deps
validate_legacy(Hash, 'validate_hash', $sahara_config)
validate_legacy(Hash, 'validate_hash', $sahara_api_paste_ini)

2
manifests/db.pp
View File

@ -62,7 +62,7 @@ class sahara::db (
$database_idle_timeout = undef,
) {
include ::sahara::deps
include sahara::deps
if $database_idle_timeout {
warning('The database_idle_timeout parameter is deprecated. Please use \

2
manifests/db/mysql.pp
View File

@ -42,7 +42,7 @@ class sahara::db::mysql(
$collate = 'utf8_general_ci',
) {
include ::sahara::deps
include sahara::deps
validate_legacy(String, 'validate_string', $password)

2
manifests/db/postgresql.pp
View File

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

2
manifests/db/sync.pp
View File

@ -12,7 +12,7 @@ class sahara::db::sync(
$extra_params = '--config-file /etc/sahara/sahara.conf',
) {
include ::sahara::deps
include sahara::deps
exec { 'sahara-dbmanage':
command => "sahara-db-manage ${extra_params} upgrade head",

10
manifests/init.pp
View File

@ -322,10 +322,10 @@ class sahara(
$cast_timeout = undef,
) {
include ::sahara::deps
include ::sahara::params
include ::sahara::db
include ::sahara::policy
include sahara::deps
include sahara::params
include sahara::db
include sahara::policy
package { 'sahara-common':
ensure => $package_ensure,
@ -402,7 +402,7 @@ class sahara(
}
if $sync_db {
include ::sahara::db::sync
include sahara::db::sync
}
}

2
manifests/keystone/auth.pp
View File

@ -78,7 +78,7 @@ class sahara::keystone::auth(
$internal_url = 'http://127.0.0.1:8386',
) {
include ::sahara::deps
include sahara::deps
keystone::resource::service_identity { 'sahara':
configure_user => true,

2
manifests/keystone/authtoken.pp
View File

@ -204,7 +204,7 @@ class sahara::keystone::authtoken(
$service_token_roles_required = $::os_service_default,
) {
include ::sahara::deps
include sahara::deps
keystone::resource::authtoken { 'sahara_config':
username => $username,

2
manifests/logging.pp
View File

@ -119,7 +119,7 @@ class sahara::logging(
$log_date_format = $::os_service_default,
) {
include ::sahara::deps
include sahara::deps
oslo::log { 'sahara_config':
debug => $debug,

2
manifests/notify.pp
View File

@ -24,7 +24,7 @@ class sahara::notify (
$notification_topics = $::os_service_default,
) {
include ::sahara::deps
include sahara::deps
oslo::messaging::notifications { 'sahara_config':
transport_url => $notification_transport_url,

2
manifests/params.pp
View File

@ -3,7 +3,7 @@
# Parameters for puppet-sahara
#
class sahara::params {
include ::openstacklib::defaults
include openstacklib::defaults
$pyvers = $::openstacklib::defaults::pyvers
$client_package_name = "python${pyvers}-saharaclient"

4
manifests/policy.pp
View File

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

6
manifests/service/all.pp
View File

@ -22,9 +22,9 @@ class sahara::service::all (
$package_ensure = 'present',
) {
include ::sahara::deps
include ::sahara::policy
include ::sahara::params
include sahara::deps
include sahara::policy
include sahara::params
warning('The sahara::service::all service is deprecated and might not be working \
please move to using separate API and engine services.')

6
manifests/service/api.pp
View File

@ -38,8 +38,8 @@ class sahara::service::api (
$service_name = $::sahara::params::api_service_name,
) inherits ::sahara::params {
include ::sahara::deps
include ::sahara::policy
include sahara::deps
include sahara::policy
if $::operatingsystem == 'Ubuntu' and $service_name == $::sahara::params::api_service_name {
fail('The Sahara API must be run with WSGI on Ubuntu')
@ -73,7 +73,7 @@ class sahara::service::api (
tag => 'sahara-service',
}
} elsif $service_name == 'httpd' {
include ::apache::params
include apache::params
if $::operatingsystem != 'Ubuntu' {
service { 'sahara-api':

4
manifests/service/engine.pp
View File

@ -22,8 +22,8 @@ class sahara::service::engine (
$package_ensure = 'present',
) {
include ::sahara::deps
include ::sahara::params
include sahara::deps
include sahara::params
package { 'sahara-engine':
ensure => $package_ensure,

10
manifests/wsgi/apache.pp
View File

@ -115,12 +115,12 @@ class sahara::wsgi::apache (
$custom_wsgi_process_options = {},
) {
include ::sahara::deps
include ::sahara::params
include ::apache
include ::apache::mod::wsgi
include sahara::deps
include sahara::params
include apache
include apache::mod::wsgi
if $ssl {
include ::apache::mod::ssl
include apache::mod::ssl
}
::openstacklib::wsgi::apache { 'sahara_wsgi':

12
spec/acceptance/basic_sahara_spec.rb
View File

@ -6,12 +6,12 @@ describe 'basic sahara' 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
class { '::openstack_integration::sahara':
include openstack_integration
include openstack_integration::repos
include openstack_integration::rabbitmq
include openstack_integration::mysql
include openstack_integration::keystone
class { 'openstack_integration::sahara':
integration_enable => false,
}
EOS

4
spec/classes/sahara_api_spec.rb
View File

@ -66,7 +66,7 @@ describe 'sahara::service::api' do
shared_examples 'sahara-api wsgi' do
let :pre_condition do
'include ::apache'
'include apache'
end
let :params do
@ -93,7 +93,7 @@ describe 'sahara::service::api' do
shared_examples 'sahara-api wsgi ubuntu' do
let :pre_condition do
'include ::apache'
'include apache'
end
let :params do