openstack/puppet-openstack-integration
Code Issues Proposed changes

Test Sahara API with WSGI

Browse Source 
Support for Sahara API in WSGI was added in dependency.
This changes so that we test with running Sahara in WSGI.

Depends-On: https://review.openstack.org/#/c/590354/
Change-Id: I59424605ff79b49b064fd90246cd70d95421425d
This commit is contained in:
Tobias Urdin 2018-08-09 16:53:40 +02:00 committed by Tobias Urdin
parent 90b23aada3
commit 7f514bb3e4
2 changed files with 48 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
fixtures/scenario003.pp
View File

@ -74,15 +74,7 @@ if $trove_enabled {
} }
include ::openstack_integration::horizon include ::openstack_integration::horizon
include ::openstack_integration::heat include ::openstack_integration::heat
include ::openstack_integration::sahara
# NOTE(tobasco): Sahara packages for Ubuntu Bionic changed
# so that the sahara-api systemd unit file does not exist.
# Disabling Sahara on Ubuntu until resolved, see this bug:
# https://bugs.launchpad.net/ubuntu/+source/sahara/+bug/1786214
if $::operatingsystem != 'Ubuntu' {
include ::openstack_integration::sahara
}
if $designate_enabled { if $designate_enabled {
include ::openstack_integration::designate include ::openstack_integration::designate
} }

53
manifests/sahara.pp
View File

@ -11,6 +11,14 @@ class openstack_integration::sahara (
include ::openstack_integration::config include ::openstack_integration::config
include ::openstack_integration::params include ::openstack_integration::params
if $::openstack_integration::config::ssl {
openstack_integration::ssl_key { 'sahara':
notify => Service['httpd'],
require => Package['sahara-api'],
}
Exec['update-ca-certificates'] ~> Service['httpd']
}
openstack_integration::mq_user { 'sahara': openstack_integration::mq_user { 'sahara':
password => 'an_even_bigger_secret', password => 'an_even_bigger_secret',
before => Anchor['sahara::service::begin'], before => Anchor['sahara::service::begin'],
@ -19,17 +27,19 @@ class openstack_integration::sahara (
class { '::sahara::db::mysql': class { '::sahara::db::mysql':
password => 'sahara', password => 'sahara',
} }
class { '::sahara::keystone::auth': class { '::sahara::keystone::auth':
# SSL does not seem to work in Sahara public_url => "${::openstack_integration::config::base_url}:8386/v1.1/%(tenant_id)s",
# https://bugs.launchpad.net/sahara/+bug/1565082 internal_url => "${::openstack_integration::config::base_url}:8386/v1.1/%(tenant_id)s",
public_url => "http://${::openstack_integration::config::ip_for_url}:8386/v1.1/%(tenant_id)s", admin_url => "${::openstack_integration::config::base_url}:8386/v1.1/%(tenant_id)s",
internal_url => "http://${::openstack_integration::config::ip_for_url}:8386/v1.1/%(tenant_id)s",
admin_url => "http://${::openstack_integration::config::ip_for_url}:8386/v1.1/%(tenant_id)s",
password => 'a_big_secret', password => 'a_big_secret',
} }
class { '::sahara': class { '::sahara':
host => $::openstack_integration::config::host, host => $::openstack_integration::config::host,
database_connection => 'mysql+pymysql://sahara:sahara@127.0.0.1/sahara?charset=utf8', database_connection => 'mysql+pymysql://sahara:sahara@127.0.0.1/sahara?charset=utf8',
use_ssl => $::openstack_integration::config::ssl,
cert_file => $::openstack_integration::params::cert_path,
key_file => "/etc/sahara/ssl/private/${::fqdn}.pem",
default_transport_url => os_transport_url({ default_transport_url => os_transport_url({
'transport' => $::openstack_integration::config::messaging_default_proto, 'transport' => $::openstack_integration::config::messaging_default_proto,
'host' => $::openstack_integration::config::host, 'host' => $::openstack_integration::config::host,
@ -49,8 +59,39 @@ class openstack_integration::sahara (
www_authenticate_uri => $::openstack_integration::config::keystone_auth_uri, www_authenticate_uri => $::openstack_integration::config::keystone_auth_uri,
memcached_servers => $::openstack_integration::config::memcached_servers, memcached_servers => $::openstack_integration::config::memcached_servers,
} }
$service_name = $::os_package_type ? {
'debian' => $::sahara::params::api_service_name,
default => 'httpd',
}
class { '::sahara::service::api': class { '::sahara::service::api':
api_workers => 2, service_name => $service_name,
}
if $service_name == 'httpd' {
# NOTE(tobias-urdin): The sahara-api package in Ubuntu installs this apache vhosts which we
# do not need since we create them using the puppetlabs-apache module. Set them as empty
# so that package upgrades still work.
if ($::operatingsystem == 'Ubuntu') and (versioncmp($::operatingsystemmajrelease, '18') >= 0) {
ensure_resource('file', '/etc/apache2/sites-available/sahara-api.conf', {
'ensure' => 'present',
'content' => '',
})
ensure_resource('file', '/etc/apache2/sites-enabled/sahara-api.conf', {
'ensure' => 'present',
'content' => '',
})
Package['sahara-api'] -> File['/etc/apache2/sites-available/sahara-api.conf']
-> File['/etc/apache2/sites-enabled/sahara-api.conf'] ~> Anchor['sahara::install::end']
}
include ::apache
class { '::sahara::wsgi::apache':
bind_host => $::openstack_integration::config::ip_for_url,
ssl => $::openstack_integration::config::ssl,
ssl_key => "/etc/sahara/ssl/private/${::fqdn}.pem",
ssl_cert => $::openstack_integration::params::cert_path,
workers => 2,
}
} }
class { '::sahara::service::engine': } class { '::sahara::service::engine': }
class { '::sahara::client': } class { '::sahara::client': }