openstack
/
puppet-ec2api
Code Issues Proposed changes

Convert all class usage to relative names 

Change-Id: I62abdd4c63236a44e0c93d21d82702b930ad2c1b
This commit is contained in:
Tobias Urdin 2019-12-08 23:04:51 +01:00
parent 25c7851220
commit b32c33cb86
15 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/init.pp
View File

@ -9,4 +9,4 @@
# Learn more about module testing here:
# https://puppet.com/docs/puppet/latest/bgtm.html#testing-your-module
#
include ::ec2api
include ec2api

2
manifests/api.pp
View File

@ -280,7 +280,7 @@ class ec2api::api (
$enabled = true,
) inherits ::ec2api::params {
include ::ec2api::deps
include ec2api::deps
validate_legacy(Boolean, 'validate_bool', $manage_service)
validate_legacy(String, 'validate_string', $service_name)

2
manifests/config.pp
View File

@ -28,7 +28,7 @@ class ec2api::config (
$ec2api_api_paste_ini = {},
) {
include ::ec2api::deps
include ec2api::deps
validate_legacy(Hash, 'validate_hash', $ec2api_config)
validate_legacy(Hash, 'validate_hash', $ec2api_api_paste_ini)

2
manifests/db.pp
View File

@ -62,7 +62,7 @@ class ec2api::db (
$database_idle_timeout = undef,
) {
include ::ec2api::deps
include ec2api::deps
validate_legacy(Oslo::Dbconn, 'validate_re', $database_connection,
['^(sqlite|mysql(\+pymysql)?|postgresql):\/\/(\S+:\S+@\S+\/\S+)?'])

2
manifests/db/mysql.pp
View File

@ -43,7 +43,7 @@ class ec2api::db::mysql (
$allowed_hosts = undef
) {
include ::ec2api::deps
include ec2api::deps
validate_legacy(String, 'validate_string', $password)
validate_legacy(String, 'validate_string', $dbname)

2
manifests/db/postgresql.pp
View File

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

2
manifests/db/sync.pp
View File

@ -17,7 +17,7 @@ class ec2api::db::sync (
$system_group = 'ec2api',
) {
include ::ec2api::deps
include ec2api::deps
exec { 'ec2api_db_sync' :
command => 'ec2-api-manage db_sync',

8
manifests/init.pp
View File

@ -32,10 +32,10 @@ class ec2api (
$purge_config = false,
) inherits ::ec2api::params {
include ::ec2api::deps
include ::ec2api::config
include ::ec2api::policy
include ::ec2api::db
include ec2api::deps
include ec2api::config
include ec2api::policy
include ec2api::db
validate_legacy(String, 'validate_string', $package_ensure)
validate_legacy(Boolean, 'validate_bool', $package_manage)

2
manifests/keystone/auth.pp
View File

@ -78,7 +78,7 @@ class ec2api::keystone::auth (
$internal_url = 'http://127.0.0.1:8788',
) inherits ::ec2api::params {
include ::ec2api::deps
include ec2api::deps
validate_legacy(String, 'validate_string', $password)
validate_legacy(String, 'validate_string', $auth_name)

2
manifests/keystone/authtoken.pp
View File

@ -202,7 +202,7 @@ class ec2api::keystone::authtoken(
$service_token_roles_required = $::os_service_default,
) {
include ::ec2api::deps
include ec2api::deps
keystone::resource::authtoken { 'ec2api_config':
username => $username,

2
manifests/logging.pp
View File

@ -123,7 +123,7 @@ class ec2api::logging(
$log_date_format = $::os_service_default,
) {
include ::ec2api::deps
include ec2api::deps
oslo::log { 'ec2api_config':
use_stderr => $use_stderr,

2
manifests/metadata.pp
View File

@ -92,7 +92,7 @@ class ec2api::metadata (
$enabled = true,
) inherits ::ec2api::params {
include ::ec2api::deps
include ec2api::deps
validate_legacy(Boolean, 'validate_bool', $manage_service)
validate_legacy(String, 'validate_string', $service_name)

2
manifests/params.pp
View File

@ -4,7 +4,7 @@
# should be considered to be constant
#
class ec2api::params {
include ::openstacklib::defaults
include openstacklib::defaults
$group = 'ec2api'
case $::osfamily {
'RedHat': {

4
manifests/policy.pp
View File

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

12
spec/acceptance/basic_ec2api_spec.rb
View File

@ -6,12 +6,12 @@ describe 'basic ec2api' 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::ec2api
include openstack_integration
include openstack_integration::repos
include openstack_integration::rabbitmq
include openstack_integration::mysql
include openstack_integration::keystone
include openstack_integration::ec2api
EOS
# Run it twice to test for idempotency