openstack/puppet-openstack-integration
Code Issues Proposed changes

Merge "Prepare for voxpupuli-puppet-lint-plugins"

Browse Source
This commit is contained in:
Zuul
2025-08-23 05:50:09 +00:00
committed by Gerrit Code Review
parent 17e41cd0b0 a3afedaf81
commit 35459dfa57
42 changed files with 26 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Rakefile
View File

@@ -1,7 +1 @@
require 'puppetlabs_spec_helper/rake_tasks'
require 'puppet-lint/tasks/puppet-lint'
PuppetLint.configuration.fail_on_warnings = true
PuppetLint.configuration.send('disable_80chars')
PuppetLint.configuration.send('disable_class_inherits_from_params_class')
PuppetSyntax.fail_on_deprecation_notices = false
require 'puppet-openstack_spec_helper/rake_tasks'

2
manifests/aodh.pp
View File

@@ -7,7 +7,6 @@
class openstack_integration::aodh (
$notification_topics = $facts['os_service_default'],
) {
include openstack_integration::config
include openstack_integration::params
@@ -111,5 +110,4 @@ class openstack_integration::aodh (
workers => 2,
}
class { 'aodh::expirer': }
}

1
manifests/apache.pp
View File

@@ -1,5 +1,4 @@
class openstack_integration::apache {
include openstack_integration::params
include openstack_integration::config
class { 'apache':

2
manifests/barbican.pp
View File

@@ -1,5 +1,4 @@
class openstack_integration::barbican {
include openstack_integration::config
include openstack_integration::params
@@ -90,5 +89,4 @@ class openstack_integration::barbican {
class { 'barbican::plugins::simple_crypto':
simple_crypto_plugin_kek => 'dGhpcnR5X3R3b19ieXRlX2tleWJsYWhibGFoYmxhaGg=',
}
}

1
manifests/bind.pp
View File

@@ -2,7 +2,6 @@
#
class openstack_integration::bind {
include openstack_integration::config
include openstack_integration::params

2
manifests/cacert.pp
View File

@@ -1,5 +1,4 @@
class openstack_integration::cacert {
include openstack_integration::params
include openstack_integration::config
@@ -17,5 +16,4 @@ class openstack_integration::cacert {
subscribe => File[$openstack_integration::params::cert_path],
refreshonly => true,
}
}

4
manifests/ceilometer.pp
View File

@@ -11,8 +11,7 @@
class openstack_integration::ceilometer (
$integration_enable = true,
$separate_polling = false,
){
) {
include openstack_integration::config
include openstack_integration::params
@@ -105,5 +104,4 @@ class openstack_integration::ceilometer (
password => 'a_big_secret',
auth_url => $openstack_integration::config::keystone_auth_uri,
}
}

3
manifests/ceph.pp
View File

@@ -23,7 +23,6 @@ class openstack_integration::ceph (
$create_cephfs = false,
$ceph_pools = ['glance', 'nova']
) {
include openstack_integration::config
if $openstack_integration::config::ipv6 {
@@ -34,7 +33,7 @@ class openstack_integration::ceph (
$ms_bind_ipv6 = false
}
stdlib::ensure_packages(['lvm2'], {'ensure' => 'present', before => Exec['lvm_create']})
stdlib::ensure_packages(['lvm2'], { before => Exec['lvm_create'] })
exec { 'lvm_create':
command => "/bin/true # comment to satisfy puppet syntax requirements

1
manifests/cinder.pp
View File

@@ -24,7 +24,6 @@ class openstack_integration::cinder (
$cinder_backup = undef,
$notification_topics = $facts['os_service_default'],
) {
include openstack_integration::config
include openstack_integration::params

4
manifests/cloudkitty.pp
View File

@@ -1,8 +1,6 @@
# Configure the cloudkitty service
#
class openstack_integration::cloudkitty (
) {
class openstack_integration::cloudkitty {
include openstack_integration::config
include openstack_integration::params

1
manifests/config.pp
View File

@@ -32,7 +32,6 @@ class openstack_integration::config (
$cache_backend = 'memcached',
$tooz_backend = 'redis',
) {
include openstack_integration::params
$messaging_default_proto = $rpc_backend

1
manifests/designate.pp
View File

@@ -7,7 +7,6 @@
class openstack_integration::designate (
$notification_topics = $facts['os_service_default'],
) {
include openstack_integration::config
include openstack_integration::params
include openstack_integration::bind

1
manifests/glance.pp
View File

@@ -18,7 +18,6 @@ class openstack_integration::glance (
$image_encryption = false,
$show_multiple_locations = undef,
) {
include openstack_integration::config
include openstack_integration::params

4
manifests/gnocchi.pp
View File

@@ -6,8 +6,7 @@
#
class openstack_integration::gnocchi (
$backend = 'file',
){
) {
include openstack_integration::config
include openstack_integration::params
@@ -135,5 +134,4 @@ class openstack_integration::gnocchi (
# random datas:
resource_id => '07f26121-5777-48ba-8a0b-d70468133dd9',
}
}

4
manifests/heat.pp
View File

@@ -7,7 +7,6 @@
class openstack_integration::heat (
$notification_topics = $facts['os_service_default'],
) {
include openstack_integration::config
include openstack_integration::params
@@ -114,7 +113,7 @@ class openstack_integration::heat (
workers => 2,
}
class { 'heat::engine':
num_engine_workers => 2,
num_engine_workers => 2,
auth_encryption_key => '1234567890AZERTYUIOPMLKJHGFDSQ12',
heat_metadata_server_url => "${openstack_integration::config::base_url}:8000",
heat_waitcondition_server_url => "${openstack_integration::config::base_url}:8000/v1/waitcondition",
@@ -130,5 +129,4 @@ class openstack_integration::heat (
workers => 2,
}
class { 'heat::cron::purge_deleted': }
}

1
manifests/horizon.pp
View File

@@ -42,7 +42,6 @@ class openstack_integration::horizon (
$octavia_enabled = false,
$designate_enabled = false,
) {
include openstack_integration::config
include openstack_integration::params

1
manifests/init.pp
View File

@@ -1,5 +1,4 @@
class openstack_integration {
Exec { logoutput => 'on_failure' }
if $facts['os']['family'] == 'RedHat' {

1
manifests/ironic.pp
View File

@@ -17,7 +17,6 @@ class openstack_integration::ironic (
$inspector_backend = 'database',
$send_power_notifications = false,
) {
include openstack_integration::config
include openstack_integration::params

2
manifests/keystone.pp
View File

@@ -15,13 +15,11 @@
# (optional) Define the token expiration to use.
# Default to '600'.
#
class openstack_integration::keystone (
$default_domain = undef,
$using_domain_config = false,
$token_expiration = '600',
) {
include openstack_integration::config
include openstack_integration::params

3
manifests/magnum.pp
View File

@@ -5,11 +5,9 @@
# Can be 'barbican', 'x509keypair' or 'local'.
# Defaults to 'barbican'.
#
class openstack_integration::magnum (
$cert_manager_type = 'barbican'
) {
include openstack_integration::config
include openstack_integration::params
@@ -116,5 +114,4 @@ class openstack_integration::magnum (
cert_manager_type => $cert_manager_type,
}
class { 'magnum::clients': }
}

1
manifests/manila.pp
View File

@@ -13,7 +13,6 @@ class openstack_integration::manila (
$backend = 'lvm',
$notification_topics = $facts['os_service_default'],
) {
include openstack_integration::config
include openstack_integration::params

1
manifests/mistral.pp
View File

@@ -1,5 +1,4 @@
class openstack_integration::mistral {
include openstack_integration::config
include openstack_integration::params

1
manifests/mq_user.pp
View File

@@ -16,7 +16,6 @@ define openstack_integration::mq_user (
$admin = true,
$vhost = '/',
) {
include openstack_integration::config
include openstack_integration::rabbitmq

1
manifests/mysql.pp
View File

@@ -1,5 +1,4 @@
class openstack_integration::mysql {
include openstack_integration::config
include openstack_integration::params

7
manifests/neutron.pp
View File

@@ -58,7 +58,6 @@ class openstack_integration::neutron (
$designate_enabled = false,
$notification_topics = $facts['os_service_default'],
) {
include openstack_integration::config
include openstack_integration::params
@@ -514,13 +513,13 @@ Environment=OS_NEUTRON_CONFIG_FILES=${join($neutron_conf_files, ';')}",
class { 'neutron::agents::l2gw': }
}
if $bgpvpn_enabled {
class {'neutron::services::bgpvpn':
class { 'neutron::services::bgpvpn':
service_providers => 'BGPVPN:Dummy:networking_bgpvpn.neutron.services.service_drivers.driver_api.BGPVPNDriver:default',
}
}
if $bgp_dragent_enabled {
class {'neutron::services::dr': }
class {'neutron::agents::bgp_dragent':
class { 'neutron::services::dr': }
class { 'neutron::agents::bgp_dragent':
bgp_router_id => '127.0.0.1',
}
}

1
manifests/nova.pp
View File

@@ -39,7 +39,6 @@ class openstack_integration::nova (
$cinder_enabled = false,
$libvirt_guests_enabled = false,
) {
include openstack_integration::config
include openstack_integration::params

3
manifests/octavia.pp
View File

@@ -17,7 +17,6 @@ class openstack_integration::octavia (
$provider_driver = 'amphora',
$jobboard_backend = 'redis',
) {
include openstack_integration::config
include openstack_integration::params
@@ -139,7 +138,7 @@ class openstack_integration::octavia (
ovn_sb_ca_cert => '/etc/octavia/switchcacert.pem',
}
require openstack_integration::ovn
} else{
} else {
$enabled_provider_drivers = undef
$enabled_provider_agents = undef
}

7
manifests/ovn.pp
View File

@@ -1,8 +1,6 @@
# Configure the ovn service
#
class openstack_integration::ovn(
){
class openstack_integration::ovn {
include openstack_integration::config
include openstack_integration::params
@@ -23,6 +21,7 @@ class openstack_integration::ovn(
$ovn_controller_ssl_cert = '/etc/openvswitch/ovncontroller-cert.pem'
$ovn_controller_ssl_ca_cert = '/var/lib/openvswitch/pki/switchca/cacert.pem'
# lint:ignore:manifest_whitespace_opening_bracket_before
['ovnnb', 'ovnsb'].each |$ovndb| {
file { "/etc/openvswitch/${ovndb}-privkey.pem":
ensure => file,
@@ -32,6 +31,7 @@ class openstack_integration::ovn(
require => Vswitch::Pki::Cert[$ovndb],
} ~> Service['northd']
}
# lint:endignore
file { '/etc/openvswitch/ovncontroller-privkey.pem':
ensure => file,
@@ -40,7 +40,6 @@ class openstack_integration::ovn(
group => 'openvswitch',
require => Vswitch::Pki::Cert['ovncontroller'],
} ~> Service['controller']
} else {
$ovn_nb_db_ssl_key = undef
$ovn_nb_db_ssl_cert = undef

4
manifests/ovn/ssl_key.pp
View File

@@ -3,9 +3,9 @@
# (optional) Owner of SSL private key
# Defaults to $name.
#
define openstack_integration::ovn::ssl_key(
define openstack_integration::ovn::ssl_key (
$key_owner = $name,
){
) {
['ovnnb', 'ovnsb'].each |$ovndb| {
["${ovndb}-privkey.pem", "${ovndb}-cert.pem"].each |$ovn_ssl_file| {
file { "/etc/${key_owner}/${ovn_ssl_file}":

2
manifests/ovs.pp
View File

@@ -4,7 +4,7 @@
# (Optional) Set up br-ex bridge.
# Defaults to true.
#
class openstack_integration::ovs(
class openstack_integration::ovs (
$manage_bridge = true
) {
include vswitch::ovs

2
manifests/params.pp
View File

@@ -1,5 +1,4 @@
class openstack_integration::params {
case $facts['os']['family'] {
'RedHat': {
$ca_bundle_cert_path = '/etc/ssl/certs/ca-bundle.crt'
@@ -21,5 +20,4 @@ class openstack_integration::params {
fail("Unsupported osfamily: ${facts['os']['family']} operatingsystem")
}
}
}

1
manifests/placement.pp
View File

@@ -1,7 +1,6 @@
# Configure the Placement service
class openstack_integration::placement {
include openstack_integration::config
include openstack_integration::params

3
manifests/provision.pp
View File

@@ -22,8 +22,7 @@ class openstack_integration::provision (
$nova = true,
$neutron = true,
$image_format = 'qcow2',
){
) {
include openstack_integration::config
if $nova {

2
manifests/rabbitmq.pp
View File

@@ -1,5 +1,4 @@
class openstack_integration::rabbitmq {
include openstack_integration::params
include openstack_integration::config
@@ -46,5 +45,4 @@ class openstack_integration::rabbitmq {
provider => 'rabbitmqctl',
require => Class['rabbitmq'],
}
}

1
manifests/repos.pp
View File

@@ -1,5 +1,4 @@
class openstack_integration::repos {
case $facts['os']['family'] {
'Debian': {
case $facts['os']['name'] {

3
manifests/ssl_key.pp
View File

@@ -8,11 +8,10 @@
# (optional) Owner of SSL private key
# Defaults to $name.
#
define openstack_integration::ssl_key(
define openstack_integration::ssl_key (
$key_path = undef,
$key_owner = $name,
) {
include openstack_integration::config
if $key_path == undef {

12
manifests/swift.pp
View File

@@ -4,10 +4,9 @@
# (Optional) Enable the ceilometer middleware
# Defaults to false
#
class openstack_integration::swift(
$ceilometer_enabled = false
){
class openstack_integration::swift (
$ceilometer_enabled = false,
) {
include openstack_integration::config
if $openstack_integration::config::ssl {
@@ -48,7 +47,6 @@ class openstack_integration::swift(
owner => $log_dir_owner,
group => 'adm',
}
} else {
file { '/var/log/swift':
ensure => directory,
@@ -157,7 +155,7 @@ class openstack_integration::swift(
# internal client
class { 'swift::internal_client':
pipeline => [ 'catch_errors', 'proxy-logging', 'cache', 'symlink', 'proxy-server' ],
pipeline => ['catch_errors', 'proxy-logging', 'cache', 'symlink', 'proxy-server'],
node_timeout => 30,
}
include swift::internal_client::catch_errors
@@ -175,7 +173,7 @@ class openstack_integration::swift(
require => Anchor['swift::install::end'],
}
# Create 3 directories under /srv/node for 3 devices
[1, 2, 3].each | $device | {
[1, 2, 3].each |$device| {
file { "/srv/node/${device}":
ensure => directory,
owner => 'swift',

1
manifests/tempest.pp
View File

@@ -195,7 +195,6 @@ class openstack_integration::tempest (
$image_format = 'qcow2',
$share_protocol = 'NFS',
) {
include openstack_integration::config
include openstack_integration::params

1
manifests/trove.pp
View File

@@ -1,5 +1,4 @@
class openstack_integration::trove {
include openstack_integration::config
include openstack_integration::params

2
manifests/vitrage.pp
View File

@@ -1,5 +1,4 @@
class openstack_integration::vitrage {
include openstack_integration::config
include openstack_integration::params
@@ -103,5 +102,4 @@ class openstack_integration::vitrage {
}
Class['openstack_integration::redis'] -> Anchor['vitrage::service::begin']
class { 'vitrage::client': }
}

4
manifests/watcher.pp
View File

@@ -1,5 +1,4 @@
class openstack_integration::watcher {
include openstack_integration::config
include openstack_integration::params
@@ -48,7 +47,7 @@ class openstack_integration::watcher {
roles => ['admin', 'service'],
password => 'a_big_secret',
}
class {'watcher::keystone::authtoken':
class { 'watcher::keystone::authtoken':
password => 'a_big_secret',
auth_version => 'v3',
user_domain_name => 'Default',
@@ -103,5 +102,4 @@ class openstack_integration::watcher {
decision_engine_workers => 2,
}
class { 'watcher::cron::db_purge': }
}

6
manifests/zaqar.pp
View File

@@ -1,5 +1,4 @@
class openstack_integration::zaqar {
include openstack_integration::config
if $openstack_integration::config::ssl {
@@ -9,7 +8,7 @@ class openstack_integration::zaqar {
}
Exec['update-ca-certificates'] ~> Service['httpd']
}
class {'zaqar::logging':
class { 'zaqar::logging':
debug => true,
}
class { 'zaqar::db::mysql':
@@ -89,9 +88,8 @@ class openstack_integration::zaqar {
bind => $openstack_integration::config::host,
notification_bind => $openstack_integration::config::host,
}
zaqar::server_instance{ '1':
zaqar::server_instance { '1':
transport => 'websocket',
}
}
}