Merge "Remove dependency on puppet-panko"
This commit is contained in:
Zuul
Gerrit Code Review
commit
d5a927e778
@ -105,10 +105,6 @@ mod 'ovn',
|
||||
:git => 'https://opendev.org/openstack/puppet-ovn',
|
||||
:ref => 'master'
|
||||
|
||||
mod 'panko',
|
||||
:git => 'https://opendev.org/openstack/puppet-panko',
|
||||
:ref => 'master'
|
||||
|
||||
mod 'placement',
|
||||
:git => 'https://opendev.org/openstack/puppet-placement',
|
||||
:ref => 'master'
|
||||
|
||||
@ -55,7 +55,6 @@ scenario](#all-in-one).
|
||||
| cinder | | rbd | iscsi | | | iscsi |
|
||||
| ceilometer | | X | | | | |
|
||||
| aodh | | X | | | | |
|
||||
| panko | | X | | | | |
|
||||
| designate | | | | bind | | |
|
||||
| backup | | | swift | | | |
|
||||
| gnocchi | | rbd | | | | |
|
||||
|
||||
@ -100,7 +100,6 @@ include openstack_integration::redis
|
||||
class { 'openstack_integration::gnocchi':
|
||||
integration_enable => true,
|
||||
}
|
||||
include openstack_integration::panko
|
||||
|
||||
class { 'openstack_integration::tempest':
|
||||
cinder => true,
|
||||
@ -108,6 +107,5 @@ class { 'openstack_integration::tempest':
|
||||
ceilometer => true,
|
||||
aodh => true,
|
||||
heat => true,
|
||||
panko => true,
|
||||
vitrage => $enable_vitrage,
|
||||
}
|
||||
|
||||
@ -58,7 +58,7 @@ class openstack_integration::ceilometer (
|
||||
|
||||
if $integration_enable {
|
||||
# Ensure Gnocchi and creads are ready before running ceilometer-upgrade
|
||||
# We use Gnocchi/Panko instead of local database, db::sync is required to populate
|
||||
# We use Gnocchi instead of local database, db::sync is required to populate
|
||||
# gnocchi resource types.
|
||||
include ceilometer::db::sync
|
||||
Service['httpd'] -> Exec['ceilometer-upgrade']
|
||||
@ -66,9 +66,8 @@ class openstack_integration::ceilometer (
|
||||
Class['ceilometer::keystone::auth'] -> Exec['ceilometer-upgrade']
|
||||
Class['gnocchi::keystone::auth'] -> Exec['ceilometer-upgrade']
|
||||
|
||||
# The default pipeline doesn't have Panko
|
||||
$sample_pipeline_publishers = ['gnocchi://']
|
||||
$event_pipeline_publishers = ['gnocchi://', 'panko://']
|
||||
$event_pipeline_publishers = ['gnocchi://']
|
||||
|
||||
class { 'ceilometer::agent::notification':
|
||||
notification_workers => '2',
|
||||
|
||||
@ -1,65 +0,0 @@
|
||||
class openstack_integration::panko {
|
||||
|
||||
include openstack_integration::config
|
||||
include openstack_integration::params
|
||||
|
||||
if $::openstack_integration::config::ssl {
|
||||
openstack_integration::ssl_key { 'panko':
|
||||
notify => Service['httpd'],
|
||||
require => Package['panko'],
|
||||
}
|
||||
Exec['update-ca-certificates'] ~> Service['httpd']
|
||||
}
|
||||
|
||||
class { 'panko::logging':
|
||||
debug => true,
|
||||
}
|
||||
|
||||
include panko
|
||||
|
||||
class { 'panko::db':
|
||||
database_connection => 'mysql+pymysql://panko:panko@127.0.0.1/panko?charset=utf8',
|
||||
}
|
||||
|
||||
class { 'panko::db::mysql':
|
||||
password => 'panko',
|
||||
}
|
||||
class { 'panko::keystone::auth':
|
||||
public_url => "${::openstack_integration::config::base_url}:8977",
|
||||
internal_url => "${::openstack_integration::config::base_url}:8977",
|
||||
admin_url => "${::openstack_integration::config::base_url}:8977",
|
||||
password => 'a_big_secret',
|
||||
}
|
||||
class { 'panko::keystone::authtoken':
|
||||
password => 'a_big_secret',
|
||||
user_domain_name => 'Default',
|
||||
project_domain_name => 'Default',
|
||||
auth_url => $::openstack_integration::config::keystone_admin_uri,
|
||||
www_authenticate_uri => $::openstack_integration::config::keystone_auth_uri,
|
||||
memcached_servers => $::openstack_integration::config::memcached_servers,
|
||||
}
|
||||
class { 'panko::api':
|
||||
sync_db => true,
|
||||
enabled => true,
|
||||
service_name => 'httpd',
|
||||
}
|
||||
# NOTE(tobias-urdin): The panko-api package in Ubuntu installs the apache vhosts which we
|
||||
# not need but we keep them as empty to not break package upgrades.
|
||||
if ($::operatingsystem == 'Ubuntu') and (versioncmp($::operatingsystemmajrelease, '18') >= 0) {
|
||||
ensure_resource('file', '/etc/apache2/sites-available/panko-api.conf', {
|
||||
'ensure' => 'present',
|
||||
'content' => '',
|
||||
})
|
||||
|
||||
Package['panko-api'] -> File['/etc/apache2/sites-available/panko-api.conf'] ~> Anchor['panko::install::end']
|
||||
}
|
||||
include apache
|
||||
class { 'panko::wsgi::apache':
|
||||
bind_host => $::openstack_integration::config::ip_for_url,
|
||||
ssl => $::openstack_integration::config::ssl,
|
||||
ssl_key => "/etc/panko/ssl/private/${::fqdn}.pem",
|
||||
ssl_cert => $::openstack_integration::params::cert_path,
|
||||
workers => 2,
|
||||
}
|
||||
|
||||
}
|
||||
@ -36,10 +36,6 @@
|
||||
# (optional) Define if Gnocchi needs to be tested.
|
||||
# Default to false.
|
||||
#
|
||||
# [*panko*]
|
||||
# (optional) Define if Panko needs to be tested.
|
||||
# Default to false.
|
||||
#
|
||||
# [*heat*]
|
||||
# (optional) Define if Heat needs to be tested.
|
||||
# Default to false.
|
||||
@ -135,7 +131,6 @@ class openstack_integration::tempest (
|
||||
$ec2api = false,
|
||||
$glance = true,
|
||||
$gnocchi = false,
|
||||
$panko = false,
|
||||
$heat = false,
|
||||
$horizon = false,
|
||||
$ironic = false,
|
||||
@ -256,7 +251,6 @@ class openstack_integration::tempest (
|
||||
mistral_available => $mistral,
|
||||
vitrage_available => $vitrage,
|
||||
gnocchi_available => $gnocchi,
|
||||
panko_available => $panko,
|
||||
ec2api_available => $ec2api,
|
||||
watcher_available => $watcher,
|
||||
public_network_name => 'public',
|
||||
|
||||
@ -24,7 +24,6 @@ openstack_extras
|
||||
openstacklib
|
||||
oslo
|
||||
ovn
|
||||
panko
|
||||
placement
|
||||
qdr
|
||||
sahara
|
||||
|
||||
@ -35,7 +35,6 @@
|
||||
- openstack/puppet-openstacklib
|
||||
- openstack/puppet-oslo
|
||||
- openstack/puppet-ovn
|
||||
- openstack/puppet-panko
|
||||
- openstack/puppet-placement
|
||||
- openstack/puppet-qdr
|
||||
- openstack/puppet-sahara
|
||||
|
||||
Loading…
Reference in New Issue
Block a user