openstack/puppet-openstack-integration
Code Issues Proposed changes

Remove puppet-sahara

Browse Source 
The sahara project was marked inactive, because of lack of appropriate
maintenance effort[1] and the project was excluded from Caracal
deliverables. This removes testing with the puppet-sahara module
because we are also retiring this module for the unmaintained project.

[1] https://review.opendev.org/c/openstack/governance/+/899986

Conflicts:
	Puppetfile
	fixtures/scenario003.pp
	manifests/sahara.pp
	zuul.d/base.yaml

Change-Id: Icb639d2724df41035af53e67de7d24558832adb6
(cherry picked from commit 835a008ebf)
(cherry picked from commit d44777f458)
This commit is contained in:
Takashi Kajinami
2024-01-22 14:40:25 +09:00
parent 24054087c2
commit 597cc035df
7 changed files with 6 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Puppetfile
View File

@@ -105,10 +105,6 @@ mod 'placement',
:git => 'https://opendev.org/openstack/puppet-placement',
:ref => 'stable/2023.1'
mod 'sahara',
:git => 'https://opendev.org/openstack/puppet-sahara',
:ref => 'stable/2023.1'
mod 'swift',
:git => 'https://opendev.org/openstack/puppet-swift',
:ref => 'stable/2023.1'

1
README.md
View File

@@ -62,7 +62,6 @@ scenario](#all-in-one).
| ec2api | | X | | | | |
| heat | X | | X | | | |
| swift | | X | | | | |
| sahara | | | X | | | |
| trove | | | X | | | |
| horizon | | | X | X | X | X |
| ironic | | X | | | | |

25
fixtures/scenario003.pp
View File

@@ -22,27 +22,18 @@ if $facts['os']['name'] == 'Ubuntu' {
case $facts['os']['family'] {
'Debian': {
$ipv6 = false
$ipv6 = false
# murano package should be fixed on Ubuntu Xenial
$murano_enabled = false
$murano_enabled = false
# trove package contains broken Tempest tests
$trove_enabled = false
# TODO(tobias-urdin): Ubuntu Train packages has not moved out Sahara
# plugins to its own packages.
if $facts['os']['name'] == 'Ubuntu' {
$sahara_integration_enable = false
} else {
$sahara_integration_enable = true
}
$trove_enabled = false
}
'RedHat': {
$ipv6 = true
$ipv6 = true
# NOTE(mnaser): We need to figure out why Murano won't accept credentials
# and how to get it to work with Keystone V3.
$murano_enabled = false
$trove_enabled = true
$sahara_integration_enable = true
$murano_enabled = false
$trove_enabled = true
}
default: {
fail("Unsupported osfamily (${facts['os']['family']})")
@@ -80,9 +71,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
if $murano_enabled {
include openstack_integration::murano
@@ -99,7 +87,6 @@ class { 'openstack_integration::tempest':
designate => true,
trove => $trove_enabled,
mistral => true,
sahara => $sahara_integration_enable,
horizon => true,
murano => $murano_enabled,
# NOTE(tkajinam): The scenario job we enable requires cinder, which is not

115
manifests/sahara.pp
View File

@@ -1,115 +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",
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,
}
class { 'sahara::service::api':
service_name => 'httpd',
}
include apache
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': }
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<||>
Class['openstack_extras::auth_file'] -> Sahara_node_group_template<||>
}
}

6
manifests/tempest.pp
View File

@@ -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.
@@ -171,7 +167,6 @@ class openstack_integration::tempest (
$neutron = true,
$nova = true,
$octavia = false,
$sahara = false,
$swift = false,
$trove = false,
$watcher = false,
@@ -306,7 +301,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,

1
openstack_modules.txt
View File

@@ -24,7 +24,6 @@ openstacklib
oslo
ovn
placement
sahara
swift
tempest
trove

2
zuul.d/base.yaml
View File

@@ -63,8 +63,6 @@
override-checkout: stable/2023.1
- name: openstack/puppet-placement
override-checkout: stable/2023.1
- name: openstack/puppet-sahara
override-checkout: stable/2023.1
- name: openstack/puppet-swift
override-checkout: stable/2023.1
- name: openstack/puppet-tempest