Merge "Remove murano" into stable/zed
This commit is contained in:
Zuul
Gerrit Code Review
commit
74d3210d87
|
|
@ -65,10 +65,6 @@ mod 'mistral',
|
|||
:git => 'https://opendev.org/openstack/puppet-mistral',
|
||||
:ref => 'stable/zed'
|
||||
|
||||
mod 'murano',
|
||||
:git => 'https://opendev.org/openstack/puppet-murano',
|
||||
:ref => 'stable/zed'
|
||||
|
||||
mod 'neutron',
|
||||
:git => 'https://opendev.org/openstack/puppet-neutron',
|
||||
:ref => 'stable/zed'
|
||||
|
|
|
|||
|
|
@ -65,7 +65,6 @@ scenario](#all-in-one).
|
|||
| horizon | | | X | X | | X |
|
||||
| ironic | | X | | | | |
|
||||
| zaqar | | X | | | | |
|
||||
| murano | | | X | | | |
|
||||
| magnum | | | X | | | |
|
||||
| mistral | | | X | | | |
|
||||
| barbican | | X | X | | | |
|
||||
|
|
|
|||
|
|
@ -25,17 +25,12 @@ case $::osfamily {
|
|||
$ipv6 = false
|
||||
# mistral is not packaged on Ubuntu Trusty
|
||||
$mistral_enabled = false
|
||||
# murano package should be fixed on Ubuntu Xenial
|
||||
$murano_enabled = false
|
||||
# trove package contains broken Tempest tests
|
||||
$trove_enabled = false
|
||||
}
|
||||
'RedHat': {
|
||||
$ipv6 = true
|
||||
$mistral_enabled = 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
|
||||
}
|
||||
default: {
|
||||
|
|
@ -73,9 +68,6 @@ class { 'openstack_integration::horizon':
|
|||
}
|
||||
include openstack_integration::heat
|
||||
include openstack_integration::designate
|
||||
if $murano_enabled {
|
||||
include openstack_integration::murano
|
||||
}
|
||||
if $mistral_enabled {
|
||||
include openstack_integration::mistral
|
||||
}
|
||||
|
|
@ -91,7 +83,6 @@ class { 'openstack_integration::tempest':
|
|||
trove => $trove_enabled,
|
||||
mistral => $mistral_enabled,
|
||||
horizon => true,
|
||||
murano => $murano_enabled,
|
||||
# NOTE(tkajinam): The scenario job we enable requires cinder, which is not
|
||||
# enabled in this scenario.
|
||||
heat => false,
|
||||
|
|
|
|||
|
|
@ -1,86 +0,0 @@
|
|||
class openstack_integration::murano {
|
||||
|
||||
include openstack_integration::config
|
||||
include openstack_integration::params
|
||||
|
||||
rabbitmq_user { ['murano', 'murano_private']:
|
||||
admin => true,
|
||||
password => 'an_even_bigger_secret',
|
||||
provider => 'rabbitmqctl',
|
||||
require => Class['rabbitmq'],
|
||||
}
|
||||
|
||||
rabbitmq_vhost { '/murano':
|
||||
provider => 'rabbitmqctl',
|
||||
require => Class['rabbitmq'],
|
||||
}
|
||||
|
||||
rabbitmq_user_permissions { ['murano@/', 'murano_private@/murano']:
|
||||
configure_permission => '.*',
|
||||
write_permission => '.*',
|
||||
read_permission => '.*',
|
||||
provider => 'rabbitmqctl',
|
||||
require => [ Class['rabbitmq'], Rabbitmq_vhost['/murano'] ],
|
||||
}
|
||||
|
||||
if $::openstack_integration::config::ssl {
|
||||
openstack_integration::ssl_key { 'murano':
|
||||
notify => Service['murano-api'],
|
||||
require => Package['murano-common'],
|
||||
}
|
||||
Exec['update-ca-certificates'] ~> Service['murano-api']
|
||||
}
|
||||
|
||||
class { 'murano::db::mysql':
|
||||
charset => $::openstack_integration::params::mysql_charset,
|
||||
collate => $::openstack_integration::params::mysql_collate,
|
||||
password => 'a_big_secret',
|
||||
}
|
||||
class { 'murano::logging':
|
||||
debug => true,
|
||||
}
|
||||
class { 'murano::db':
|
||||
database_connection => 'mysql+pymysql://murano:a_big_secret@127.0.0.1/murano?charset=utf8',
|
||||
}
|
||||
class { 'murano::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 { 'murano':
|
||||
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' => 'murano',
|
||||
'password' => 'an_even_bigger_secret',
|
||||
}),
|
||||
rabbit_os_use_ssl => $::openstack_integration::config::ssl,
|
||||
rabbit_own_user => 'murano_private',
|
||||
rabbit_own_password => 'an_even_bigger_secret',
|
||||
rabbit_own_vhost => '/murano',
|
||||
rabbit_own_host => $::openstack_integration::config::host,
|
||||
rabbit_own_port => $::openstack_integration::config::rabbit_port,
|
||||
rabbit_own_use_ssl => $::openstack_integration::config::ssl,
|
||||
use_ssl => $::openstack_integration::config::ssl,
|
||||
service_host => $::openstack_integration::config::ip_for_url,
|
||||
cert_file => $::openstack_integration::params::cert_path,
|
||||
key_file => "/etc/murano/ssl/private/${::fqdn}.pem",
|
||||
}
|
||||
class { 'murano::api':
|
||||
host => $::openstack_integration::config::host,
|
||||
}
|
||||
|
||||
class { 'murano::engine': }
|
||||
|
||||
class { 'murano::keystone::auth':
|
||||
password => 'a_big_secret',
|
||||
public_url => "${::openstack_integration::config::base_url}:8082",
|
||||
internal_url => "${::openstack_integration::config::base_url}:8082",
|
||||
admin_url => "${::openstack_integration::config::base_url}:8082",
|
||||
}
|
||||
-> murano::application { 'io.murano': }
|
||||
}
|
||||
|
|
@ -41,25 +41,7 @@ class openstack_integration::provision (
|
|||
disk => '2',
|
||||
vcpus => '1',
|
||||
}
|
||||
# NOTE(ykarel): "m1.small" flavor is required by murano scenario tests
|
||||
nova_flavor { 'm1.small':
|
||||
ensure => present,
|
||||
id => '2',
|
||||
ram => '128',
|
||||
disk => '2',
|
||||
vcpus => '1',
|
||||
}
|
||||
# NOTE(amoralej): "m1.tiny" flavor is required by murano scenario tests
|
||||
# https://review.opendev.org/#/c/480848/ moved jobs from m1.small
|
||||
nova_flavor { 'm1.tiny':
|
||||
ensure => present,
|
||||
id => '1',
|
||||
ram => '128',
|
||||
disk => '2',
|
||||
vcpus => '1',
|
||||
}
|
||||
Keystone_user_role <||>-> Nova_flavor<||>
|
||||
Keystone_endpoint <||>-> Nova_flavor<||>
|
||||
|
||||
Keystone_user_role['admin@openstack'] -> Nova_flavor<||>
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -84,10 +84,6 @@
|
|||
# (optional) Define if Octavia needs to be tested.
|
||||
# Default to false.
|
||||
#
|
||||
# [*murano*]
|
||||
# (optional) Define if Murano needs to be tested.
|
||||
# Default to false.
|
||||
#
|
||||
# [*swift*]
|
||||
# (optional) Define if Swift needs to be tested.
|
||||
# Default to false.
|
||||
|
|
@ -158,7 +154,6 @@ class openstack_integration::tempest (
|
|||
$magnum = false,
|
||||
$manila = false,
|
||||
$mistral = false,
|
||||
$murano = false,
|
||||
$neutron = true,
|
||||
$nova = true,
|
||||
$octavia = false,
|
||||
|
|
@ -326,7 +321,6 @@ class openstack_integration::tempest (
|
|||
ca_certificates_file => $::openstack_integration::params::ca_bundle_cert_path,
|
||||
manage_tests_packages => true,
|
||||
attach_encrypted_volume => $attach_encrypted_volume,
|
||||
murano_available => $murano,
|
||||
tempest_workspace => '/tmp/openstack/tempest',
|
||||
run_ssh => true,
|
||||
# NOTE(tkajinam): The recent openssl doesn't accept SHA1 by default, which
|
||||
|
|
|
|||
|
|
@ -14,7 +14,6 @@ keystone
|
|||
magnum
|
||||
manila
|
||||
mistral
|
||||
murano
|
||||
neutron
|
||||
nova
|
||||
octavia
|
||||
|
|
|
|||
|
|
@ -38,8 +38,6 @@
|
|||
- name: openstack/puppet-mistral
|
||||
override-checkout: stable/zed
|
||||
- x/puppet-modulesync-configs
|
||||
- name: openstack/puppet-murano
|
||||
override-checkout: stable/zed
|
||||
- name: openstack/puppet-neutron
|
||||
override-checkout: stable/zed
|
||||
- name: openstack/puppet-nova
|
||||
|
|
|
|||
Loading…
Reference in New Issue