add vitrage
Change-Id: Ibdb1e687ec348fa4147a9ca970b4f0f1c355ade9
This commit is contained in:
parent
7f5a13e986
commit
94fad23968
@ -133,6 +133,10 @@ mod 'trove',
|
|||||||
:git => 'https://git.openstack.org/openstack/puppet-trove',
|
:git => 'https://git.openstack.org/openstack/puppet-trove',
|
||||||
:ref => 'master'
|
:ref => 'master'
|
||||||
|
|
||||||
|
mod 'vitrage',
|
||||||
|
:git => 'https://git.openstack.org/openstack/puppet-vitrage',
|
||||||
|
:ref => 'master'
|
||||||
|
|
||||||
mod 'vswitch',
|
mod 'vswitch',
|
||||||
:git => 'https://git.openstack.org/openstack/puppet-vswitch',
|
:git => 'https://git.openstack.org/openstack/puppet-vswitch',
|
||||||
:ref => 'master'
|
:ref => 'master'
|
||||||
|
@ -69,6 +69,7 @@ scenario](#all-in-one).
|
|||||||
| ceph | X | | | X | |
|
| ceph | X | | | X | |
|
||||||
| ceph rgw | | | | X | |
|
| ceph rgw | | | | X | |
|
||||||
| mongodb | | X | | | |
|
| mongodb | | X | | | |
|
||||||
|
| vitrage | X | | | | |
|
||||||
| watcher | | | | X | |
|
| watcher | | | | X | |
|
||||||
|
|
||||||
When the Jenkins slave is created, the *run_tests.sh* script will executed.
|
When the Jenkins slave is created, the *run_tests.sh* script will executed.
|
||||||
|
@ -17,12 +17,14 @@
|
|||||||
case $::osfamily {
|
case $::osfamily {
|
||||||
'Debian': {
|
'Debian': {
|
||||||
$ipv6 = false
|
$ipv6 = false
|
||||||
# panko is not packaged yet in debian/ubuntu
|
# panko and vitrage are not packaged yet in debian/ubuntu
|
||||||
$enable_panko = false
|
$enable_panko = false
|
||||||
|
$enable_vitrage = false
|
||||||
}
|
}
|
||||||
'RedHat': {
|
'RedHat': {
|
||||||
$ipv6 = true
|
$ipv6 = true
|
||||||
$enable_panko = true
|
$enable_panko = true
|
||||||
|
$enable_vitrage = true
|
||||||
}
|
}
|
||||||
default: {
|
default: {
|
||||||
fail("Unsupported osfamily (${::osfamily})")
|
fail("Unsupported osfamily (${::osfamily})")
|
||||||
@ -59,6 +61,9 @@ class { '::openstack_integration::cinder':
|
|||||||
}
|
}
|
||||||
include ::openstack_integration::ceilometer
|
include ::openstack_integration::ceilometer
|
||||||
include ::openstack_integration::aodh
|
include ::openstack_integration::aodh
|
||||||
|
if $enable_vitrage {
|
||||||
|
include ::openstack_integration::vitrage
|
||||||
|
}
|
||||||
include ::openstack_integration::gnocchi
|
include ::openstack_integration::gnocchi
|
||||||
include ::openstack_integration::ceph
|
include ::openstack_integration::ceph
|
||||||
include ::openstack_integration::provision
|
include ::openstack_integration::provision
|
||||||
@ -72,4 +77,5 @@ class { '::openstack_integration::tempest':
|
|||||||
ceilometer => true,
|
ceilometer => true,
|
||||||
aodh => true,
|
aodh => true,
|
||||||
panko => $enable_panko,
|
panko => $enable_panko,
|
||||||
|
vitrage => $enable_vitrage,
|
||||||
}
|
}
|
||||||
|
@ -76,6 +76,10 @@
|
|||||||
# (optional) Define if Trove needs to be tested.
|
# (optional) Define if Trove needs to be tested.
|
||||||
# Default to false.
|
# Default to false.
|
||||||
#
|
#
|
||||||
|
# [*vitrage*]
|
||||||
|
# (optional) Define if Vitrage needs to be tested.
|
||||||
|
# Default to false.
|
||||||
|
#
|
||||||
# [*watcher*]
|
# [*watcher*]
|
||||||
# (optional) Define if Watcher needs to be tested.
|
# (optional) Define if Watcher needs to be tested.
|
||||||
# Default to false.
|
# Default to false.
|
||||||
@ -109,6 +113,7 @@ class openstack_integration::tempest (
|
|||||||
$swift = false,
|
$swift = false,
|
||||||
$trove = false,
|
$trove = false,
|
||||||
$watcher = false,
|
$watcher = false,
|
||||||
|
$vitrage = false,
|
||||||
$zaqar = false,
|
$zaqar = false,
|
||||||
$attach_encrypted_volume = false,
|
$attach_encrypted_volume = false,
|
||||||
) {
|
) {
|
||||||
@ -165,6 +170,7 @@ class openstack_integration::tempest (
|
|||||||
ironic_available => $ironic,
|
ironic_available => $ironic,
|
||||||
zaqar_available => $zaqar,
|
zaqar_available => $zaqar,
|
||||||
mistral_available => $mistral,
|
mistral_available => $mistral,
|
||||||
|
vitrage_available => $vitrage,
|
||||||
gnocchi_available => $gnocchi,
|
gnocchi_available => $gnocchi,
|
||||||
panko_available => $panko,
|
panko_available => $panko,
|
||||||
ec2api_available => $ec2api,
|
ec2api_available => $ec2api,
|
||||||
|
90
manifests/vitrage.pp
Normal file
90
manifests/vitrage.pp
Normal file
@ -0,0 +1,90 @@
|
|||||||
|
class openstack_integration::vitrage {
|
||||||
|
|
||||||
|
include ::openstack_integration::config
|
||||||
|
include ::openstack_integration::params
|
||||||
|
|
||||||
|
rabbitmq_user { 'vitrage':
|
||||||
|
admin => true,
|
||||||
|
password => 'an_even_bigger_secret',
|
||||||
|
provider => 'rabbitmqctl',
|
||||||
|
require => Class['::rabbitmq'],
|
||||||
|
}
|
||||||
|
rabbitmq_user_permissions { 'vitrage@/':
|
||||||
|
configure_permission => '.*',
|
||||||
|
write_permission => '.*',
|
||||||
|
read_permission => '.*',
|
||||||
|
provider => 'rabbitmqctl',
|
||||||
|
require => Class['::rabbitmq'],
|
||||||
|
}
|
||||||
|
|
||||||
|
if $::openstack_integration::config::ssl {
|
||||||
|
openstack_integration::ssl_key { 'vitrage':
|
||||||
|
notify => Service['httpd'],
|
||||||
|
require => Package['vitrage'],
|
||||||
|
}
|
||||||
|
Exec['update-ca-certificates'] ~> Service['httpd']
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
class { '::vitrage':
|
||||||
|
default_transport_url => os_transport_url({
|
||||||
|
'transport' => 'rabbit',
|
||||||
|
'host' => $::openstack_integration::config::host,
|
||||||
|
'port' => $::openstack_integration::config::rabbit_port,
|
||||||
|
'username' => 'vitrage',
|
||||||
|
'password' => 'an_even_bigger_secret',
|
||||||
|
}),
|
||||||
|
rabbit_use_ssl => $::openstack_integration::config::ssl,
|
||||||
|
debug => true,
|
||||||
|
} ->
|
||||||
|
|
||||||
|
# Make sure tempest can read the configuration files
|
||||||
|
# default installation has a 640 premission
|
||||||
|
file { '/etc/vitrage':
|
||||||
|
ensure => directory,
|
||||||
|
recurse => true,
|
||||||
|
mode => '0644',
|
||||||
|
} ->
|
||||||
|
|
||||||
|
# Make sure tempest can write to the log directory
|
||||||
|
# default installation has a 755 premission
|
||||||
|
file { '/var/log/vitrage':
|
||||||
|
ensure => directory,
|
||||||
|
mode => '0766',
|
||||||
|
}
|
||||||
|
|
||||||
|
class { '::vitrage::keystone::auth':
|
||||||
|
public_url => "${::openstack_integration::config::base_url}:8999",
|
||||||
|
internal_url => "${::openstack_integration::config::base_url}:8999",
|
||||||
|
admin_url => "${::openstack_integration::config::base_url}:8999",
|
||||||
|
password => 'a_big_secret',
|
||||||
|
}
|
||||||
|
class { '::vitrage::keystone::authtoken':
|
||||||
|
password => 'a_big_secret',
|
||||||
|
user_domain_name => 'Default',
|
||||||
|
project_domain_name => 'Default',
|
||||||
|
auth_url => $::openstack_integration::config::keystone_admin_uri,
|
||||||
|
auth_uri => $::openstack_integration::config::keystone_auth_uri,
|
||||||
|
memcached_servers => $::openstack_integration::config::memcached_servers,
|
||||||
|
}
|
||||||
|
class { '::vitrage::api':
|
||||||
|
enabled => true,
|
||||||
|
service_name => 'httpd',
|
||||||
|
}
|
||||||
|
include ::apache
|
||||||
|
class { '::vitrage::wsgi::apache':
|
||||||
|
bind_host => $::openstack_integration::config::ip_for_url,
|
||||||
|
ssl => $::openstack_integration::config::ssl,
|
||||||
|
ssl_key => "/etc/vitrage/ssl/private/${::fqdn}.pem",
|
||||||
|
ssl_cert => $::openstack_integration::params::cert_path,
|
||||||
|
workers => 2,
|
||||||
|
}
|
||||||
|
class { '::vitrage::auth':
|
||||||
|
auth_url => $::openstack_integration::config::keystone_auth_uri,
|
||||||
|
auth_password => 'a_big_secret',
|
||||||
|
}
|
||||||
|
class { '::vitrage::graph': }
|
||||||
|
class { '::vitrage::notifier': }
|
||||||
|
class { '::vitrage::client': }
|
||||||
|
|
||||||
|
}
|
@ -32,5 +32,6 @@ tacker
|
|||||||
tempest
|
tempest
|
||||||
trove
|
trove
|
||||||
vswitch
|
vswitch
|
||||||
|
vitrage
|
||||||
watcher
|
watcher
|
||||||
zaqar
|
zaqar
|
||||||
|
@ -242,6 +242,10 @@ echo "TelemetryAlarming" >> /tmp/openstack/tempest/test-whitelist.txt
|
|||||||
# Gnocchi
|
# Gnocchi
|
||||||
echo "gnocchi.tempest" >> /tmp/openstack/tempest/test-whitelist.txt
|
echo "gnocchi.tempest" >> /tmp/openstack/tempest/test-whitelist.txt
|
||||||
|
|
||||||
|
# Vitrage
|
||||||
|
# until I fix the tempest tests (they only work in the gate)
|
||||||
|
echo "TestTopology.test_compare_api_and_cli" >> /tmp/openstack/tempest/test-whitelist.txt
|
||||||
|
|
||||||
# Ironic
|
# Ironic
|
||||||
# Note: running all Ironic tests under SSL is not working
|
# Note: running all Ironic tests under SSL is not working
|
||||||
# https://bugs.launchpad.net/ironic/+bug/1554237
|
# https://bugs.launchpad.net/ironic/+bug/1554237
|
||||||
|
Loading…
Reference in New Issue
Block a user