Replace legacy facts and use fact hash 

... because the latest lint no longer allows usage of legacy facts and
top scope fact.
Change-Id: I25d27829f66c4ee56e2755579dad21530ef09c3a
This commit is contained in:
Takashi Kajinami
2023年03月01日 10:29:37 +09:00
parent dcaa10cfb3
commit 2f1d35f59c

View File

@@ -14,7 +14,7 @@
#limitationsundertheLicense.
#
if($::os['family']=='Debian'){
if($facts['os']['family']=='Debian'){
include apache::params
class { 'apache':
mod_packages => merge($::apache::params::mod_packages, {

View File

@@ -16,20 +16,20 @@
#Keystoneonlypuppetdeployment
if$::os['name']=='Ubuntu'{
if$facts['os']['name']=='Ubuntu'{
$ssl = false
}else{
$ssl = true
}
if$::osfamily=='RedHat'{
if$facts['os']['family']=='RedHat'{
# (amoralej) - disable selinux defaults until
# https://tickets.puppetlabs.com/browse/PUP-7559 is fixed
Concat { selinux_ignore_defaults => true }
File{ selinux_ignore_defaults => true }
}
case$::osfamily{
case$facts['os']['family']{
'Debian': {
$ipv6 = false
$om_rpc = 'rabbit'
@@ -41,7 +41,7 @@ case $::osfamily {
$om_notify = 'rabbit'
}
default:{
fail("Unsupported osfamily (${::osfamily})")
fail("Unsupported osfamily (${facts['os']['family']})")
}
}

View File

@@ -14,20 +14,20 @@
#limitationsundertheLicense.
#
if$::os['name']=='Ubuntu'{
if$facts['os']['name']=='Ubuntu'{
$ssl = false
}else{
$ssl = true
}
case$::osfamily{
case$facts['os']['family']{
'Debian': {
$ipv6 = false
# vitrage are not packaged yet in debian/ubuntu
$enable_vitrage = false
$om_rpc = 'rabbit'
$om_notify = 'rabbit'
$notification_topics = $::os_service_default
$notification_topics = $facts['os_service_default']
}
'RedHat':{
$ipv6 = true
@@ -37,7 +37,7 @@ case $::osfamily {
$notification_topics = ['notifications', 'vitrage_notifications']
}
default:{
fail("Unsupported osfamily (${::osfamily})")
fail("Unsupported osfamily (${facts['os']['family']})")
}
}

View File

@@ -14,13 +14,13 @@
#limitationsundertheLicense.
#
if$::os['name']=='Ubuntu'{
if$facts['os']['name']=='Ubuntu'{
$ssl = false
}else{
$ssl = true
}
case$::osfamily{
case$facts['os']['family']{
'Debian': {
$ipv6 = false
# ec2api is not packaged on UCA
@@ -31,7 +31,7 @@ case $::osfamily {
$ec2api_enabled = true
}
default:{
fail("Unsupported osfamily (${::osfamily})")
fail("Unsupported osfamily (${facts['os']['family']})")
}
}

View File

@@ -14,13 +14,13 @@
#limitationsundertheLicense.
#
if$::os['name']=='Ubuntu'{
if$facts['os']['name']=='Ubuntu'{
$ssl = false
}else{
$ssl = true
}
case$::osfamily{
case$facts['os']['family']{
'Debian': {
$ipv6 = false
# mistral is not packaged on Ubuntu Trusty
@@ -32,7 +32,7 @@ case $::osfamily {
# TODO(tobias-urdin): Ubuntu Train packages has not moved out Sahara
# plugins to its own packages.
if $::operatingsystem == 'Ubuntu' {
if $facts['os']['name'] == 'Ubuntu' {
$sahara_integration_enable = false
}else{
$sahara_integration_enable = true
@@ -48,7 +48,7 @@ case $::osfamily {
$sahara_integration_enable = true
}
default:{
fail("Unsupported osfamily (${::osfamily})")
fail("Unsupported osfamily (${facts['os']['family']})")
}
}

View File

@@ -14,13 +14,13 @@
#limitationsundertheLicense.
#
if$::os['name']=='Ubuntu'{
if$facts['os']['name']=='Ubuntu'{
$ssl = false
}else{
$ssl = true
}
if$::operatingsystem=='Ubuntu'{
if$facts['os']['name']=='Ubuntu'{
$ipv6 = false
# TODO(tobias-urdin): No service plugin 'BGPVPN'
$bgpvpn_enabled = false

View File

@@ -14,13 +14,13 @@
#limitationsundertheLicense.
#
if$::os['name']=='Ubuntu'{
if$facts['os']['name']=='Ubuntu'{
$ssl = false
}else{
$ssl = true
}
case$::osfamily{
case$facts['os']['family']{
'Debian': {
$ipv6 = false
}
@@ -28,7 +28,7 @@ case $::osfamily {
$ipv6 = true
}
default:{
fail("Unsupported osfamily (${::osfamily})")
fail("Unsupported osfamily (${facts['os']['family']})")
}
}

View File

@@ -2,10 +2,10 @@
#
#[*notification_topics*]
#(optional)AMQPtopicusedforOpenStacknotifications
#Defaultsto$::os_service_default.
#Defaultsto$facts['os_service_default'].
#
classopenstack_integration::aodh(
$notification_topics=$::os_service_default,
$notification_topics=$facts['os_service_default'],
){
include openstack_integration::config
@@ -86,7 +86,7 @@ class openstack_integration::aodh (
class{ 'aodh::wsgi::apache':
bind_host => $::openstack_integration::config::host,
ssl => $::openstack_integration::config::ssl,
ssl_key => "/etc/aodh/ssl/private/${::fqdn}.pem",
ssl_key => "/etc/aodh/ssl/private/${facts['networking']['fqdn']}.pem",
ssl_cert=>$::openstack_integration::params::cert_path,
workers=>2,
}

View File

@@ -3,7 +3,7 @@ class openstack_integration::apache {
include openstack_integration::params
include openstack_integration::config
if ($::os['family'] == 'Debian') {
if ($facts['os']['family'] == 'Debian') {
include apache::params
class { 'apache':
mod_packages => merge($::apache::params::mod_packages, {

View File

@@ -80,7 +80,7 @@ class openstack_integration::barbican {
class{ 'barbican::wsgi::apache':
bind_host => $::openstack_integration::config::host,
ssl => $::openstack_integration::config::ssl,
ssl_key => "/etc/barbican/ssl/private/${::fqdn}.pem",
ssl_key => "/etc/barbican/ssl/private/${facts['networking']['fqdn']}.pem",
ssl_cert=>$::openstack_integration::params::cert_path,
workers=>2,
}

View File

@@ -54,7 +54,7 @@ test -b /dev/ceph_vg/lv_data
ms_bind_ipv6 => $ms_bind_ipv6,
authentication_type => 'cephx',
mon_host => $::openstack_integration::config::ip_for_url,
mon_initial_members => $::hostname,
mon_initial_members => $facts['networking']['hostname'],
osd_pool_default_size => '1',
osd_pool_default_min_size => '1',
mon_key => 'AQD7kyJQQGoOBhAAqrPAqSopSwPrrfMMomzVdw==',

View File

@@ -16,13 +16,13 @@
#
#[*notification_topics*]
#(optional)AMQPtopicusedforOpenStacknotifications
#Defaultsto$::os_service_default.
#Defaultsto$facts['os_service_default'].
#
classopenstack_integration::cinder(
$backend='iscsi',
$volume_encryption=false,
$cinder_backup=false,
$notification_topics=$::os_service_default,
$notification_topics=$facts['os_service_default'],
){
include openstack_integration::config
@@ -112,7 +112,7 @@ class openstack_integration::cinder (
class{ 'cinder::wsgi::apache':
bind_host => $::openstack_integration::config::host,
ssl => $::openstack_integration::config::ssl,
ssl_key => "/etc/cinder/ssl/private/${::fqdn}.pem",
ssl_key => "/etc/cinder/ssl/private/${facts['networking']['fqdn']}.pem",
ssl_cert=>$::openstack_integration::params::cert_path,
workers=>2,
}

View File

@@ -80,7 +80,7 @@ class openstack_integration::designate {
includeapache
class{ 'designate::wsgi::apache':
bind_host => $::openstack_integration::config::host,
ssl_key => "/etc/designate/ssl/private/${::fqdn}.pem",
ssl_key => "/etc/designate/ssl/private/${facts['networking']['fqdn']}.pem",
ssl_cert=>$::openstack_integration::params::cert_path,
ssl=>$::openstack_integration::config::ssl,
workers=>'2',

View File

@@ -17,7 +17,7 @@ class openstack_integration::ec2api {
password => 'ec2api',
host => $::openstack_integration::config::host,
}
case$::osfamily{
case$facts['os']['family']{
'RedHat': {
class { 'ec2api::db':
database_connection => os_database_connection({
@@ -58,7 +58,7 @@ class openstack_integration::ec2api {
warning('ec2api is not yet packaged on Ubuntu systems.')
}
default:{
fail("Unsupported osfamily (${::osfamily})")
fail("Unsupported osfamily (${facts['os']['family']})")
}
}
}

View File

@@ -89,7 +89,7 @@ class openstack_integration::gnocchi (
class{ 'gnocchi::wsgi::apache':
bind_host => $::openstack_integration::config::host,
ssl => $::openstack_integration::config::ssl,
ssl_key => "/etc/gnocchi/ssl/private/${::fqdn}.pem",
ssl_key => "/etc/gnocchi/ssl/private/${facts['networking']['fqdn']}.pem",
ssl_cert=>$::openstack_integration::params::cert_path,
workers=>2,
}

View File

@@ -2,10 +2,10 @@
#
#[*notification_topics*]
#(optional)AMQPtopicusedforOpenStacknotifications
#Defaultsto$::os_service_default.
#Defaultsto$facts['os_service_default'].
#
classopenstack_integration::heat(
$notification_topics=$::os_service_default,
$notification_topics=$facts['os_service_default'],
){
include openstack_integration::config
@@ -20,7 +20,7 @@ class openstack_integration::heat (
openstack_integration::ssl_key { 'heat':
require => Package['heat-common'],
}
$key_file="/etc/heat/ssl/private/${::fqdn}.pem"
$key_file="/etc/heat/ssl/private/${facts['networking']['fqdn']}.pem"
$crt_file=$::openstack_integration::params::cert_path
File[$key_file]~>Service<|tag=='heat-service'|>
Exec['update-ca-certificates']~>Service<|tag=='heat-service'|>

View File

@@ -30,10 +30,10 @@ class openstack_integration::horizon (
mode => '0755',
selinux_ignore_defaults => true,
require => File['/etc/openstack-dashboard/ssl'],
before => File["/etc/openstack-dashboard/ssl/private/${::fqdn}.pem"],
before => File["/etc/openstack-dashboard/ssl/private/${facts['networking']['fqdn']}.pem"],
}
openstack_integration::ssl_key{ 'horizon':
key_path => "/etc/openstack-dashboard/ssl/private/${::fqdn}.pem",
key_path => "/etc/openstack-dashboard/ssl/private/${facts['networking']['fqdn']}.pem",
key_owner=>'root',
require=>File['/etc/openstack-dashboard/ssl/private'],
notify=>Service['httpd'],
@@ -44,7 +44,7 @@ class openstack_integration::horizon (
#TODO(tkajinam):SwitchtopymemcachebackendwhenwebumpUbuntufrom
#FocaltoJammy.ThepymemcachepackageinForcalistooold
#andisnotcompatiblewithDjango.
$cache_backend=$::osfamily?{
$cache_backend=$facts['os']['family']?{
'Debian' => 'django.core.cache.backends.memcached.MemcachedCache',
default => 'django.core.cache.backends.memcached.PyMemcacheCache'
}
@@ -57,7 +57,7 @@ class openstack_integration::horizon (
listen_ssl => $::openstack_integration::config::ssl,
ssl_redirect => $::openstack_integration::config::ssl,
ssl_cert => $::openstack_integration::params::cert_path,
ssl_key => "/etc/openstack-dashboard/ssl/private/${::fqdn}.pem",
ssl_key => "/etc/openstack-dashboard/ssl/private/${facts['networking']['fqdn']}.pem",
ssl_ca=>$::openstack_integration::params::ca_bundle_cert_path,
ssl_verify_client=>'optional',
keystone_url=>$::openstack_integration::config::keystone_auth_uri,

View File

@@ -2,7 +2,7 @@ class openstack_integration {
Exec { logoutput => 'on_failure' }
if$::osfamily=='RedHat'{
if$facts['os']['family']=='RedHat'{
package { 'openstack-selinux':
ensure => 'latest'
}

View File

@@ -70,7 +70,7 @@ class openstack_integration::ironic {
class{ 'ironic::wsgi::apache':
bind_host => $::openstack_integration::config::host,
ssl => $::openstack_integration::config::ssl,
ssl_key => "/etc/ironic/ssl/private/${::fqdn}.pem",
ssl_key => "/etc/ironic/ssl/private/${facts['networking']['fqdn']}.pem",
ssl_cert=>$::openstack_integration::params::cert_path,
workers=>2,
}

View File

@@ -96,7 +96,7 @@ class openstack_integration::keystone (
class{ 'keystone::wsgi::apache':
bind_host => $::openstack_integration::config::host,
ssl => $::openstack_integration::config::ssl,
ssl_key => "/etc/keystone/ssl/private/${::fqdn}.pem",
ssl_key => "/etc/keystone/ssl/private/${facts['networking']['fqdn']}.pem",
ssl_cert=>$::openstack_integration::params::cert_path,
workers=>2,
}

View File

@@ -22,7 +22,7 @@ class openstack_integration::magnum (
openstack_integration::ssl_key { 'magnum':
require => Package['magnum-common'],
}
$key_file="/etc/magnum/ssl/private/${::fqdn}.pem"
$key_file="/etc/magnum/ssl/private/${facts['networking']['fqdn']}.pem"
$crt_file=$::openstack_integration::params::cert_path
File[$key_file]~>Service<|tag=='magnum-service'|>
Exec['update-ca-certificates']~>Service<|tag=='magnum-service'|>

View File

@@ -7,11 +7,11 @@
#
#[*notification_topics*]
#(optional)AMQPtopicusedforOpenStacknotifications
#Defaultsto$::os_service_default.
#Defaultsto$facts['os_service_default'].
#
classopenstack_integration::manila(
$backend='lvm',
$notification_topics=$::os_service_default,
$notification_topics=$facts['os_service_default'],
){
include openstack_integration::config
@@ -95,7 +95,7 @@ class openstack_integration::manila (
class{ 'manila::wsgi::apache':
bind_host => $::openstack_integration::config::host,
ssl => $::openstack_integration::config::ssl,
ssl_key => "/etc/manila/ssl/private/${::fqdn}.pem",
ssl_key => "/etc/manila/ssl/private/${facts['networking']['fqdn']}.pem",
ssl_cert=>$::openstack_integration::params::cert_path,
workers=>2,
}

View File

@@ -64,7 +64,7 @@ class openstack_integration::mistral {
class{ 'mistral::wsgi::apache':
bind_host => $::openstack_integration::config::host,
ssl => $::openstack_integration::config::ssl,
ssl_key => "/etc/mistral/ssl/private/${::fqdn}.pem",
ssl_key => "/etc/mistral/ssl/private/${facts['networking']['fqdn']}.pem",
ssl_cert=>$::openstack_integration::params::cert_path,
workers=>2,
threads=>1,

View File

@@ -84,7 +84,7 @@ class openstack_integration::murano {
use_ssl=>$::openstack_integration::config::ssl,
service_host=>$::openstack_integration::config::ip_for_url,
cert_file=>$::openstack_integration::params::cert_path,
key_file=>"/etc/murano/ssl/private/${::fqdn}.pem",
key_file=>"/etc/murano/ssl/private/${facts['networking']['fqdn']}.pem",
}
class{ 'murano::api':
host => $::openstack_integration::config::host,

View File

@@ -20,14 +20,14 @@
#
#[*notification_topics*]
#(optional)AMQPtopicusedforOpenStacknotifications
#Defaultsto$::os_service_default.
#Defaultsto$facts['os_service_default'].
#
classopenstack_integration::neutron(
$driver='openvswitch',
$bgpvpn_enabled=false,
$l2gw_enabled=false,
$bgp_dragent_enabled=false,
$notification_topics=$::os_service_default,
$notification_topics=$facts['os_service_default'],
){
include openstack_integration::config
@@ -41,7 +41,7 @@ class openstack_integration::neutron (
Exec['update-ca-certificates']~>Service<|tag=='neutron-service'|>
}
if$::operatingsystem=='CentOS'{
if$facts['os']['name']=='CentOS'{
# os_neutron_dac_override should be on to start privsep-helper
# See https://bugzilla.redhat.com/show_bug.cgi?id=1850973
selboolean { 'os_neutron_dac_override':
@@ -121,11 +121,11 @@ class openstack_integration::neutron (
default => undef,
}
if$l2gw_enabled{
if ($::operatingsystem == 'Ubuntu') {
if ($facts['os']['name'] == 'Ubuntu') {
class { 'neutron::services::l2gw': }
$providers_list=['L2GW:l2gw:networking_l2gw.services.l2gateway.service_drivers.L2gwDriver:default']
}
elsif($::operatingsystem!='Ubuntu'){
elsif($facts['os']['name']!='Ubuntu'){
class { 'neutron::services::l2gw':
service_providers => ['L2GW:l2gw:networking_l2gw.services.l2gateway.service_drivers.L2gwDriver:default']
}
@@ -178,7 +178,7 @@ class openstack_integration::neutron (
bind_host=>$::openstack_integration::config::host,
use_ssl=>$::openstack_integration::config::ssl,
cert_file=>$::openstack_integration::params::cert_path,
key_file=>"/etc/neutron/ssl/private/${::fqdn}.pem",
key_file=>"/etc/neutron/ssl/private/${facts['networking']['fqdn']}.pem",
notification_topics=>$notification_topics,
notification_driver=>'messagingv2',
global_physnet_mtu=>$global_physnet_mtu,
@@ -194,7 +194,7 @@ class openstack_integration::neutron (
memcached_servers => $::openstack_integration::config::memcached_servers,
}
if$::osfamily=='Debian'{
if$facts['os']['family']=='Debian'{
$auth_url = $::openstack_integration::config::keystone_auth_uri
exec { 'check-neutron-server':
command => "openstack --os-auth-url ${auth_url}--os-project-nameservices--os-usernameneutron--os-identity-api-version3networklist",
@@ -234,7 +234,7 @@ class openstack_integration::neutron (
}
$max_header_size=$driver?{
'ovn' => 38,
default => $::os_service_default
default => $facts['os_service_default']
}
class{ 'neutron::plugins::ml2':
type_drivers => [$overlay_network_type, 'vlan', 'flat'],
@@ -265,7 +265,7 @@ class openstack_integration::neutron (
}
'linuxbridge':{
class { 'neutron::agents::ml2::linuxbridge':
local_ip => $::ipaddress,
local_ip => $facts['networking']['ip'],
tunnel_types => ['vxlan'],
physical_interface_mappings => ['external:loop0'],
firewall_driver => 'iptables',

View File

@@ -20,14 +20,14 @@
#
#[*notification_topics*]
#(optional)AMQPtopicusedforOpenStacknotifications
#Defaultsto$::os_service_default.
#Defaultsto$facts['os_service_default'].
#
classopenstack_integration::nova(
$libvirt_rbd=false,
$libvirt_virt_type='qemu',
$libvirt_cpu_mode='none',
$volume_encryption=false,
$notification_topics=$::os_service_default,
$notification_topics=$facts['os_service_default'],
){
include openstack_integration::config
@@ -151,14 +151,14 @@ class openstack_integration::nova (
includeapache
class{ 'nova::wsgi::apache_api':
bind_host => $::openstack_integration::config::host,
ssl_key => "/etc/nova/ssl/private/${::fqdn}.pem",
ssl_key => "/etc/nova/ssl/private/${facts['networking']['fqdn']}.pem",
ssl_cert=>$::openstack_integration::params::cert_path,
ssl=>$::openstack_integration::config::ssl,
workers=>'2',
}
class{ 'nova::wsgi::apache_metadata':
bind_host => $::openstack_integration::config::host,
ssl_key => "/etc/nova/ssl/private/${::fqdn}.pem",
ssl_key => "/etc/nova/ssl/private/${facts['networking']['fqdn']}.pem",
ssl_cert=>$::openstack_integration::params::cert_path,
ssl=>$::openstack_integration::config::ssl,
workers=>'2',
@@ -189,7 +189,7 @@ class openstack_integration::nova (
#libvirtd.servicerunning,thoughwestoptheservicein
#puppet-nova.Untilwefixthefailure,usesshtransport
#whichdoesnotrequiresocketservices.
$migration_transport=$::osfamily?{
$migration_transport=$facts['os']['family']?{
'Debian' => 'ssh',
default => 'tcp'
}
@@ -199,7 +199,7 @@ class openstack_integration::nova (
$images_type=$libvirt_rbd?{
true => 'rbd',
false => $::os_service_default
false => $facts['os_service_default']
}
class{ 'nova::compute::libvirt':
virt_type => $libvirt_virt_type,

View File

@@ -2,14 +2,14 @@
#
#[*notification_topics*]
#(optional)AMQPtopicusedforOpenStacknotifications
#Defaultsto$::os_service_default.
#Defaultsto$facts['os_service_default'].
#
#[*provider_driver*]
#(optional)ProviderdriverusedinOctavia.
#Defaultsto'amphora'.
#
classopenstack_integration::octavia(
$notification_topics=$::os_service_default,
$notification_topics=$facts['os_service_default'],
$provider_driver='amphora',
){
@@ -132,8 +132,8 @@ class openstack_integration::octavia (
ovn_sb_connection=>"tcp:${::openstack_integration::config::ip_for_url}:6642",
}
}else{
$enabled_provider_drivers = $::os_service_default
$enabled_provider_agents = $::os_service_default
$enabled_provider_drivers = undef
$enabled_provider_agents = undef
}
class{ 'octavia::api':
@@ -146,7 +146,7 @@ class openstack_integration::octavia (
class{ 'octavia::wsgi::apache':
bind_host => $::openstack_integration::config::host,
ssl => $::openstack_integration::config::ssl,
ssl_key => "/etc/octavia/ssl/private/${::fqdn}.pem",
ssl_key => "/etc/octavia/ssl/private/${facts['networking']['fqdn']}.pem",
ssl_cert=>$::openstack_integration::params::cert_path,
workers=>2,
}

View File

@@ -1,6 +1,6 @@
classopenstack_integration::params{
case $::osfamily {
case $facts['os']['family'] {
'RedHat': {
$ca_bundle_cert_path = '/etc/ssl/certs/ca-bundle.crt'
$cert_path = '/etc/pki/ca-trust/source/anchors/puppet_openstack.pem'
@@ -16,7 +16,7 @@ class openstack_integration::params {
$mysql_collate = 'utf8mb3_general_ci'
}
default:{
fail("Unsupported osfamily: ${::osfamily}operatingsystem")
fail("Unsupported osfamily: ${facts['os']['family']}operatingsystem")
}
}

View File

@@ -52,17 +52,17 @@ class openstack_integration::placement {
}
includeplacement::db::sync
#TODO(tkajinam):Removethisoncelpbug1987984isfixed.
if$::operatingsystem=='Ubuntu'{
if$facts['os']['name']=='Ubuntu'{
class { 'placement::policy':
purge_config => true
}
}
includeplacement::api
includeapache
if($::operatingsystem!='Debian'){
if($facts['os']['name']!='Debian'){
class { 'placement::wsgi::apache':
bind_host => $::openstack_integration::config::host,
ssl_key => "/etc/placement/ssl/private/${::fqdn}.pem",
ssl_key => "/etc/placement/ssl/private/${facts['networking']['fqdn']}.pem",
ssl_cert=>$::openstack_integration::params::cert_path,
ssl=>$::openstack_integration::config::ssl,
workers=>'2',

View File

@@ -3,7 +3,7 @@ class openstack_integration::qdr {
include openstack_integration::params
include openstack_integration::config
if $::osfamily == 'Debian' {
if $facts['os']['family'] == 'Debian' {
include apt
Class['apt::update'] -> Package<| provider == 'apt' |>
apt::ppa { 'ppa:qpid/released' : }
@@ -30,10 +30,10 @@ class openstack_integration::qdr {
owner => 'root',
mode => '0755',
selinux_ignore_defaults => true,
before => File["/etc/qpid-dispatch/ssl/private/${::fqdn}.pem"],
before => File["/etc/qpid-dispatch/ssl/private/${facts['networking']['fqdn']}.pem"],
}
openstack_integration::ssl_key{ 'qdrouterd':
key_path => "/etc/qpid-dispatch/ssl/private/${::fqdn}.pem",
key_path => "/etc/qpid-dispatch/ssl/private/${facts['networking']['fqdn']}.pem",
require=>File['/etc/qpid-dispatch/ssl/private'],
notify=>Service['qdrouterd'],
}
@@ -41,7 +41,7 @@ class openstack_integration::qdr {
listener_require_ssl => true,
listener_ssl_cert_db => $::openstack_integration::params::ca_bundle_cert_path,
listener_ssl_cert_file => $::openstack_integration::params::cert_path,
listener_ssl_key_file => "/etc/qpid-dispatch/ssl/private/${::fqdn}.pem",
listener_ssl_key_file => "/etc/qpid-dispatch/ssl/private/${facts['networking']['fqdn']}.pem",
listener_addr=>$::openstack_integration::config::host,
listener_port=>$::openstack_integration::config::messaging_default_port,
listener_sasl_mech=>'PLAIN',

View File

@@ -9,28 +9,28 @@ class openstack_integration::rabbitmq {
owner => 'root',
mode => '0755',
selinux_ignore_defaults => true,
before => File["/etc/rabbitmq/ssl/private/${::fqdn}.pem"],
before => File["/etc/rabbitmq/ssl/private/${facts['networking']['fqdn']}.pem"],
}
openstack_integration::ssl_key{ 'rabbitmq':
key_path => "/etc/rabbitmq/ssl/private/${::fqdn}.pem",
key_path => "/etc/rabbitmq/ssl/private/${facts['networking']['fqdn']}.pem",
require=>File['/etc/rabbitmq/ssl/private'],
notify=>Service['rabbitmq-server'],
}
class{ 'rabbitmq':
package_provider => $::package_provider,
package_provider => $facts['package_provider'],
delete_guest_user => true,
ssl => true,
ssl_only => true,
ssl_cacert => $::openstack_integration::params::ca_bundle_cert_path,
ssl_cert => $::openstack_integration::params::cert_path,
ssl_key => "/etc/rabbitmq/ssl/private/${::fqdn}.pem",
ssl_key => "/etc/rabbitmq/ssl/private/${facts['networking']['fqdn']}.pem",
environment_variables=>$::openstack_integration::config::rabbit_env,
repos_ensure=>false,
manage_python=>false,
}
}else{
class { 'rabbitmq':
package_provider => $::package_provider,
package_provider => $facts['package_provider'],
delete_guest_user => true,
environment_variables => $::openstack_integration::config::rabbit_env,
repos_ensure => false,

View File

@@ -1,13 +1,13 @@
classopenstack_integration::repos{
# To make litmus tests work.
if defined('$::ceph_version') and $::ceph_version != '' {
$ceph_version_real = $::ceph_version
if $facts['ceph_version'] and $facts['ceph_version'] != '' {
$ceph_version_real = $facts['ceph_version']
}else{
$ceph_version_real = 'quincy'
}
if$::operatingsystem=='Ubuntu'andversioncmp($::operatingsystemmajrelease,'22')>=0{
if$facts['os']['name']=='Ubuntu'andversioncmp($facts['os']['release']['major'],'22')>=0{
# NOTE(tkajinam): Upstream ceph repository does not provide packages for
# Ubuntu Jammy, so we use packages from UCA.
$enable_ceph_repository = false
@@ -15,15 +15,15 @@ class openstack_integration::repos {
$enable_ceph_repository = true
}
case$::osfamily{
case$facts['os']['family']{
'Debian': {
case $::operatingsystem {
case $facts['os']['name'] {
'Ubuntu': {
include apt
class { 'openstack_extras::repo::debian::ubuntu':
release => 'zed',
package_require => true,
uca_location => pick($::uca_mirror_host, 'http://ubuntu-cloud.archive.canonical.com/ubuntu'),
uca_location => pick($facts['uca_mirror_host'], 'http://ubuntu-cloud.archive.canonical.com/ubuntu'),
}
}
'Debian':{
@@ -34,11 +34,11 @@ class openstack_integration::repos {
}
}
default:{
fail("Unsupported package type (${::operatingsystem})")
fail("Unsupported package type (${facts['os']['name']})")
}
}
$ceph_mirror_fallback=pick($::ceph_mirror_host,"http://download.ceph.com/debian-${ceph_version_real}/")
$ceph_mirror_fallback=pick($facts['ceph_mirror_host'],"http://download.ceph.com/debian-${ceph_version_real}/")
if$enable_ceph_repository{
# Ceph is both packaged on UCA and official download.ceph.com packages
# which we mirror. We want to use the official packages or our mirror.
@@ -63,22 +63,22 @@ class openstack_integration::repos {
'RedHat':{
$powertools_repo = 'crb'
if defined('$::centos_mirror_host') and $::centos_mirror_host != '' {
$centos_mirror = $::centos_mirror_host
if $facts['centos_mirror_host'] and $facts['centos_mirror_host'] != '' {
$centos_mirror = $facts['centos_mirror_host']
}else{
$centos_mirror = 'http://mirror.stream.centos.org'
}
ifdefined('$::delorean_repo_path')and$::delorean_repo_path!=''{
$delorean_repo = $::delorean_repo_path
if$facts['delorean_repo_path']and$facts['delorean_repo_path']!=''{
$delorean_repo = $facts['delorean_repo_path']
}else{
$delorean_repo = "https://trunk.rdoproject.org/centos${::os['release']['major']}-master/puppet-passed-ci/delorean.repo"
$delorean_repo = "https://trunk.rdoproject.org/centos${facts['os']['release']['major']}-master/puppet-passed-ci/delorean.repo"
}
ifdefined('$::delorean_deps_repo_path')and$::delorean_deps_repo_path!=''{
$delorean_deps_repo = $::delorean_deps_repo_path
if$facts['delorean_deps_repo_path']and$facts['delorean_deps_repo_path']!=''{
$delorean_deps_repo = $facts['delorean_deps_repo_path']
}else{
$delorean_deps_repo = "https://trunk.rdoproject.org/centos${::os['release']['major']}-master/delorean-deps.repo"
$delorean_deps_repo = "https://trunk.rdoproject.org/centos${facts['os']['release']['major']}-master/delorean-deps.repo"
}
class{ 'openstack_extras::repo::redhat::redhat':
@@ -93,17 +93,17 @@ class openstack_integration::repos {
update_packages=>true,
}
$ceph_mirror_fallback="${centos_mirror}/SIGs/${::os['release']['major']}-stream/storage/x86_64/ceph-${ceph_version_real}/"
$ceph_mirror_fallback="${centos_mirror}/SIGs/${facts['os']['release']['major']}-stream/storage/x86_64/ceph-${ceph_version_real}/"
ifdefined('$::ceph_mirror_host')and$::ceph_mirror_host!=''{
$ceph_mirror = $::ceph_mirror_host
if$facts['ceph_mirror_host']and$facts['ceph_mirror_host']!=''{
$ceph_mirror = $facts['ceph_mirror_host']
}else{
$ceph_mirror = $ceph_mirror_fallback
}
#OnCentOS,deployCephusingSIGrepositoryandgetridofEPEL.
#https://wiki.centos.org/SpecialInterestGroup/Storage/
if$::operatingsystem=='CentOS'{
if$facts['os']['name']=='CentOS'{
$enable_sig = true
$enable_epel = false
}else{
@@ -119,7 +119,7 @@ class openstack_integration::repos {
}
}
default:{
fail("Unsupported osfamily (${::osfamily})")
fail("Unsupported osfamily (${facts['os']['family']})")
}
}
@@ -136,7 +136,7 @@ class openstack_integration::repos {
ensure => 'present',
}
if$::osfamily=='RedHat'{
if$facts['os']['family']=='RedHat'{
# NOTE(tobias-urdin): Install libibverbs to fix an issue where OVS outputs errors
# that causes the puppet-openvswitch module to fail parsing the output.
# This issue does not occur in integration testing but only module tests since some

View File

@@ -54,7 +54,7 @@ class openstack_integration::sahara (
host => $::openstack_integration::config::host,
use_ssl => $::openstack_integration::config::ssl,
cert_file => $::openstack_integration::params::cert_path,
key_file => "/etc/sahara/ssl/private/${::fqdn}.pem",
key_file => "/etc/sahara/ssl/private/${facts['networking']['fqdn']}.pem",
default_transport_url=>os_transport_url({
'transport' => $::openstack_integration::config::messaging_default_proto,
'host' => $::openstack_integration::config::host,
@@ -73,7 +73,7 @@ class openstack_integration::sahara (
www_authenticate_uri => $::openstack_integration::config::keystone_auth_uri,
memcached_servers => $::openstack_integration::config::memcached_servers,
}
$service_name=$::operatingsystem?{
$service_name=$facts['os']['name']?{
'Debian' => $::sahara::params::api_service_name,
default => 'httpd',
}
@@ -85,7 +85,7 @@ class openstack_integration::sahara (
class { 'sahara::wsgi::apache':
bind_host => $::openstack_integration::config::host,
ssl => $::openstack_integration::config::ssl,
ssl_key => "/etc/sahara/ssl/private/${::fqdn}.pem",
ssl_key => "/etc/sahara/ssl/private/${facts['networking']['fqdn']}.pem",
ssl_cert=>$::openstack_integration::params::cert_path,
workers=>2,
}

View File

@@ -16,7 +16,7 @@ define openstack_integration::ssl_key(
include openstack_integration::config
if $key_path == undef {
$_key_path = "/etc/${name}/ssl/private/${::fqdn}.pem"
$_key_path = "/etc/${name}/ssl/private/${facts['networking']['fqdn']}.pem"
}else{
$_key_path = $key_path
}

View File

@@ -14,9 +14,9 @@ class openstack_integration::swift {
before => Anchor['swift::service::begin'],
}
if($::operatingsystem=='Debian'){
if($facts['os']['name']=='Debian'){
# Ubuntu/Debian requires particular permissions for rsyslog to work
$log_dir_owner = $::operatingsystem ? {
$log_dir_owner = $facts['os']['name'] ? {
'Debian' => 'swift',
default => 'syslog'
}

View File

@@ -255,13 +255,13 @@ class openstack_integration::tempest (
#Installmisseddependencyforneutrontests
#https://github.com/openstack/neutron/blob/master/test-requirements.txt#L20
if$::operatingsystem=='Ubuntu'{
if$facts['os']['name']=='Ubuntu'{
package { ['python3-ddt', 'python3-oslotest', 'python3-gabbi']:
ensure => present
}
}
$dashboard_url=$::osfamily?{
$dashboard_url=$facts['os']['family']?{
'RedHat' => "${::openstack_integration::config::base_url}/dashboard",
default=>"${::openstack_integration::config::base_url}/horizon"
}
@@ -270,7 +270,7 @@ class openstack_integration::tempest (
debug => true,
use_stderr => false,
log_file => 'tempest.log',
tempest_clone_owner => $::id,
tempest_clone_owner => $facts['identity']['user'],
git_clone => false,
tempest_clone_path => '/tmp/openstack/tempest',
lock_path => '/tmp/openstack/tempest',

View File

@@ -75,7 +75,7 @@ class openstack_integration::trove {
class{ 'trove::wsgi::apache':
bind_host => $::openstack_integration::config::host,
ssl => $::openstack_integration::config::ssl,
ssl_key => "/etc/trove/ssl/private/${::fqdn}.pem",
ssl_key => "/etc/trove/ssl/private/${facts['networking']['fqdn']}.pem",
ssl_cert=>$::openstack_integration::params::cert_path,
workers=>2,
}

View File

@@ -100,7 +100,7 @@ class openstack_integration::vitrage {
class{ 'vitrage::wsgi::apache':
bind_host => $::openstack_integration::config::host,
ssl => $::openstack_integration::config::ssl,
ssl_key => "/etc/vitrage/ssl/private/${::fqdn}.pem",
ssl_key => "/etc/vitrage/ssl/private/${facts['networking']['fqdn']}.pem",
ssl_cert=>$::openstack_integration::params::cert_path,
workers=>2,
}

View File

@@ -82,7 +82,7 @@ class openstack_integration::watcher {
class{ 'watcher::wsgi::apache':
bind_host => $::openstack_integration::config::host,
ssl => $::openstack_integration::config::ssl,
ssl_key => "/etc/watcher/ssl/private/${::fqdn}.pem",
ssl_key => "/etc/watcher/ssl/private/${facts['networking']['fqdn']}.pem",
ssl_cert=>$::openstack_integration::params::cert_path,
workers=>2,
}

View File

@@ -66,13 +66,13 @@ class openstack_integration::zaqar {
bind_host => $::openstack_integration::config::host,
ssl => $::openstack_integration::config::ssl,
ssl_cert => $::openstack_integration::params::cert_path,
ssl_key => "/etc/zaqar/ssl/private/${::fqdn}.pem",
ssl_key => "/etc/zaqar/ssl/private/${facts['networking']['fqdn']}.pem",
workers=>2,
}
includezaqar::db::sync
#runasecondinstanceusingwebsockets,theDebiansystemdoes
#notsupporttheuseofservicestorunasecondinstance.
if$::osfamily=='RedHat'{
if$facts['os']['family']=='RedHat'{
class { 'zaqar::transport::websocket':
bind => $::openstack_integration::config::host,
notification_bind => $::openstack_integration::config::host,
Reference in New Issue
openstack/puppet-openstack-integration
Block a user
Blocking a user prevents them from interacting with repositories, such as opening or commenting on pull requests or issues. Learn more about blocking a user.

The note is not visible to the blocked user.