Browse Source

Convert all class usage to relative names

Change-Id: Ic8aff2f30d3473d22c8eac49a431ed044e9ce584
changes/17/697917/1
Tobias Urdin 2 years ago
parent
commit
0b5a01dd87
  1. 2
      examples/virtual_packages.pp
  2. 4
      manifests/db/mysql.pp
  3. 2
      manifests/params.pp
  4. 6
      manifests/wsgi/apache.pp
  5. 2
      spec/acceptance/mysql_spec.rb
  6. 8
      spec/acceptance/rabbitmq_spec.rb
  7. 6
      spec/defines/openstacklib_db_postgresql_spec.rb

2
examples/virtual_packages.pp

@ -1,6 +1,6 @@
Exec { logoutput => 'on_failure' }
include ::openstacklib::defaults
include openstacklib::defaults
if $::osfamily == 'RedHat' {
# Virtual package name, present in @base.

4
manifests/db/mysql.pp

@ -64,8 +64,8 @@ define openstacklib::db::mysql (
$tls_options = ['NONE'],
) {
include ::mysql::server
include ::mysql::client
include mysql::server
include mysql::client
mysql_database { $dbname:
ensure => present,

2
manifests/params.pp

@ -5,7 +5,7 @@
#
class openstacklib::params {
include ::openstacklib::defaults
include openstacklib::defaults
$pyvers = $::openstacklib::defaults::pyvers
$openstackclient_package_name = "python${pyvers}-openstackclient"

6
manifests/wsgi/apache.pp

@ -260,10 +260,10 @@ define openstacklib::wsgi::apache (
$error_log_syslog = undef,
) {
include ::apache
include ::apache::mod::wsgi
include apache
include apache::mod::wsgi
if $ssl {
include ::apache::mod::ssl
include apache::mod::ssl
}
# Ensure there's no trailing '/' except if this is also the only character

2
spec/acceptance/mysql_spec.rb

@ -8,7 +8,7 @@ describe 'openstacklib mysql' do
pp= <<-EOS
Exec { logoutput => 'on_failure' }
class { '::mysql::server': }
class { 'mysql::server': }
::openstacklib::db::mysql { 'beaker':
password_hash => mysql::password('keystone'),

8
spec/acceptance/rabbitmq_spec.rb

@ -6,12 +6,12 @@ describe 'openstacklib class' do
it 'should work with no errors' do
pp= <<-EOS
include ::openstack_integration
include ::openstack_integration::repos
include ::openstack_integration::rabbitmq
include openstack_integration
include openstack_integration::repos
include openstack_integration::rabbitmq
# openstacklib resources
include ::openstacklib::openstackclient
include openstacklib::openstackclient
::openstacklib::messaging::rabbitmq { 'beaker':
userid => 'beaker',

6
spec/defines/openstacklib_db_postgresql_spec.rb

@ -10,7 +10,7 @@ describe 'openstacklib::db::postgresql' do
end
let (:pre_condition) do
"include ::postgresql::server"
"include postgresql::server"
end
shared_examples 'openstacklib::db::postgresql examples' do
@ -43,7 +43,7 @@ describe 'openstacklib::db::postgresql' do
context 'when notifying other resources' do
let :pre_condition do
"include ::postgresql::server
"include postgresql::server
exec { 'nova-db-sync': }"
end
@ -56,7 +56,7 @@ describe 'openstacklib::db::postgresql' do
context 'when required for other openstack services' do
let :pre_condition do
"include ::postgresql::server
"include postgresql::server
service {'keystone':}"
end

Loading…
Cancel
Save