Merge "Remove puppet-sahara"
This commit is contained in:
Zuul
Gerrit Code Review
commit
1d1b99eb2d
@ -105,10 +105,6 @@ mod 'placement',
|
||||
:git => 'https://opendev.org/openstack/puppet-placement',
|
||||
:ref => 'master'
|
||||
|
||||
mod 'sahara',
|
||||
:git => 'https://opendev.org/openstack/puppet-sahara',
|
||||
:ref => 'master'
|
||||
|
||||
mod 'swift',
|
||||
:git => 'https://opendev.org/openstack/puppet-swift',
|
||||
:ref => 'master'
|
||||
|
||||
@ -62,7 +62,6 @@ scenario](#all-in-one).
|
||||
| ec2api | | X | | | | |
|
||||
| heat | X | | X | | | |
|
||||
| swift | | X | | | | |
|
||||
| sahara | | | X | | | |
|
||||
| trove | | | X | | | |
|
||||
| horizon | | X | X | X | X | X |
|
||||
| ironic | | X | | | | |
|
||||
|
||||
@ -61,9 +61,6 @@ class { 'openstack_integration::horizon':
|
||||
heat_enabled => true
|
||||
}
|
||||
include openstack_integration::heat
|
||||
class { 'openstack_integration::sahara':
|
||||
integration_enable => $sahara_integration_enable,
|
||||
}
|
||||
include openstack_integration::designate
|
||||
include openstack_integration::murano
|
||||
include openstack_integration::mistral
|
||||
@ -78,7 +75,6 @@ class { 'openstack_integration::tempest':
|
||||
designate => true,
|
||||
trove => true,
|
||||
mistral => true,
|
||||
sahara => true,
|
||||
horizon => true,
|
||||
# TODO(tkajinam): Some of the murano tests still fail.
|
||||
murano => false,
|
||||
|
||||
@ -1,116 +0,0 @@
|
||||
# Configure the Sahara service
|
||||
#
|
||||
# [*integration_enable*]
|
||||
# (optional) Boolean to run integration tests.
|
||||
# Defaults to true.
|
||||
#
|
||||
class openstack_integration::sahara (
|
||||
$integration_enable = true,
|
||||
){
|
||||
|
||||
include openstack_integration::config
|
||||
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':
|
||||
password => 'an_even_bigger_secret',
|
||||
before => Anchor['sahara::service::begin'],
|
||||
}
|
||||
|
||||
class { 'sahara::db::mysql':
|
||||
charset => $::openstack_integration::params::mysql_charset,
|
||||
collate => $::openstack_integration::params::mysql_collate,
|
||||
password => 'sahara',
|
||||
host => $::openstack_integration::config::host,
|
||||
}
|
||||
|
||||
class { 'sahara::keystone::auth':
|
||||
public_url => "${::openstack_integration::config::base_url}:8386",
|
||||
internal_url => "${::openstack_integration::config::base_url}:8386",
|
||||
admin_url => "${::openstack_integration::config::base_url}:8386",
|
||||
roles => ['admin', 'service'],
|
||||
password => 'a_big_secret',
|
||||
}
|
||||
class { 'sahara::logging':
|
||||
debug => true,
|
||||
}
|
||||
class { 'sahara::db':
|
||||
database_connection => os_database_connection({
|
||||
'dialect' => 'mysql+pymysql',
|
||||
'host' => $::openstack_integration::config::ip_for_url,
|
||||
'username' => 'sahara',
|
||||
'password' => 'sahara',
|
||||
'database' => 'sahara',
|
||||
'charset' => 'utf8',
|
||||
'extra' => $::openstack_integration::config::db_extra,
|
||||
}),
|
||||
}
|
||||
class { 'sahara':
|
||||
host => $::openstack_integration::config::host,
|
||||
default_transport_url => os_transport_url({
|
||||
'transport' => $::openstack_integration::config::messaging_default_proto,
|
||||
'host' => $::openstack_integration::config::host,
|
||||
'port' => $::openstack_integration::config::messaging_default_port,
|
||||
'username' => 'sahara',
|
||||
'password' => 'an_even_bigger_secret',
|
||||
}),
|
||||
rabbit_use_ssl => $::openstack_integration::config::ssl,
|
||||
}
|
||||
class { 'sahara::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,
|
||||
service_token_roles_required => true,
|
||||
}
|
||||
class { 'sahara::service::api':
|
||||
service_name => 'httpd',
|
||||
}
|
||||
class { 'sahara::wsgi::apache':
|
||||
bind_host => $::openstack_integration::config::host,
|
||||
ssl => $::openstack_integration::config::ssl,
|
||||
ssl_key => "/etc/sahara/ssl/private/${facts['networking']['fqdn']}.pem",
|
||||
ssl_cert => $::openstack_integration::params::cert_path,
|
||||
workers => 2,
|
||||
}
|
||||
class { 'sahara::service::engine': }
|
||||
class { 'sahara::client': }
|
||||
class { 'sahara::notify': }
|
||||
sahara::plugin { 'vanilla': }
|
||||
|
||||
if $integration_enable {
|
||||
# create simple sahara templates
|
||||
sahara_node_group_template { 'master':
|
||||
ensure => present,
|
||||
plugin => 'vanilla',
|
||||
plugin_version => '2.7.1',
|
||||
flavor => 'm1.micro',
|
||||
node_processes => [ 'namenode', 'resourcemanager' ],
|
||||
}
|
||||
|
||||
sahara_node_group_template { 'worker':
|
||||
ensure => present,
|
||||
plugin => 'vanilla',
|
||||
plugin_version => '2.7.1',
|
||||
flavor => 'm1.micro',
|
||||
node_processes => [ 'datanode', 'nodemanager' ],
|
||||
}
|
||||
|
||||
sahara_cluster_template { 'cluster':
|
||||
ensure => present,
|
||||
node_groups => [ 'master:1', 'worker:2' ]
|
||||
}
|
||||
|
||||
Nova_flavor<||> -> Sahara_node_group_template<||>
|
||||
Class['sahara::keystone::auth'] -> Sahara_node_group_template<||>
|
||||
}
|
||||
}
|
||||
@ -88,10 +88,6 @@
|
||||
# (optional) Define if Octavia needs to be tested.
|
||||
# Default to false.
|
||||
#
|
||||
# [*sahara*]
|
||||
# (optional) Define if Sahara needs to be tested.
|
||||
# Default to false.
|
||||
#
|
||||
# [*murano*]
|
||||
# (optional) Define if Murano needs to be tested.
|
||||
# Default to false.
|
||||
@ -183,7 +179,6 @@ class openstack_integration::tempest (
|
||||
$neutron = true,
|
||||
$nova = true,
|
||||
$octavia = false,
|
||||
$sahara = false,
|
||||
$swift = false,
|
||||
$trove = false,
|
||||
$watcher = false,
|
||||
@ -332,7 +327,6 @@ class openstack_integration::tempest (
|
||||
ceilometer_available => $ceilometer,
|
||||
aodh_available => $aodh,
|
||||
trove_available => $trove,
|
||||
sahara_available => $sahara,
|
||||
heat_available => $heat,
|
||||
swift_available => $swift,
|
||||
ironic_available => $ironic,
|
||||
|
||||
@ -24,7 +24,6 @@ openstacklib
|
||||
oslo
|
||||
ovn
|
||||
placement
|
||||
sahara
|
||||
swift
|
||||
tempest
|
||||
trove
|
||||
|
||||
@ -35,7 +35,6 @@
|
||||
- name: openstack/puppet-oslo
|
||||
- name: openstack/puppet-ovn
|
||||
- name: openstack/puppet-placement
|
||||
- name: openstack/puppet-sahara
|
||||
- name: openstack/puppet-swift
|
||||
- name: openstack/puppet-tempest
|
||||
- name: openstack/puppet-trove
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user