openstack/puppet-openstack-integration
Code Issues Proposed changes

Switch to default_transport_url

Browse Source 
The rabbit_host, rabbit_hosts, rabbit_userid, rabbit_password,
rabbit_port and rabbit_virtual_host parameters are being deprecated.
This change updates the p-o-i tests to use the default_transport_url for
the rabbit connection instead.

Change-Id: Icb15ad3b5d75a35afcb685f4ae03c5755031fc3d
Depends-On: I43ac3079da9e52179457ca1a34f4faee60d5617b
Depends-On: Ie63457370ae37ef5af5878b1a97b8bafa80a8189
Depends-On: Ia0c5b5072431bbc186c8b96b7f034e68e9248af3
Depends-On: I43500ac7be4296ea534266fa14ca37fc700b0092
Depends-On: If4dfe8b82518fc4e590731a805ee3115b11f4f47
Depends-On: I00d4782693c1f67b82673624d4d36822c9762303
Depends-On: If83c0f0e61a08061334536399a42767a305966b7
This commit is contained in:
Alex Schultz 2016-11-09 09:41:17 -07:00
parent 6952029ab3
commit ddcb1b4786
14 changed files with 153 additions and 105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
manifests/aodh.pp
View File

@ -33,14 +33,17 @@ class openstack_integration::aodh {
$gnocchi_url = undef
}
class { '::aodh':
rabbit_userid => 'aodh',
rabbit_password => 'an_even_bigger_secret',
rabbit_port => $::openstack_integration::config::rabbit_port,
rabbit_use_ssl => $::openstack_integration::config::ssl,
debug => true,
rabbit_host => $::openstack_integration::config::ip_for_url,
database_connection => 'mysql+pymysql://aodh:aodh@127.0.0.1/aodh?charset=utf8',
gnocchi_url => $gnocchi_url,
default_transport_url => os_transport_url({
'transport' => 'rabbit',
'host' => $::openstack_integration::config::host,
'port' => $::openstack_integration::config::rabbit_port,
'username' => 'aodh',
'password' => 'an_even_bigger_secret',
}),
rabbit_use_ssl => $::openstack_integration::config::ssl,
debug => true,
database_connection => 'mysql+pymysql://aodh:aodh@127.0.0.1/aodh?charset=utf8',
gnocchi_url => $gnocchi_url,
}
class { '::aodh::db::mysql':
password => 'aodh',

11
manifests/barbican.pp
View File

@ -52,16 +52,19 @@ class openstack_integration::barbican {
project_domain_name => 'Default',
}
class { '::barbican::api':
default_transport_url => os_transport_url({
'transport' => 'rabbit',
'host' => $::openstack_integration::config::host,
'port' => $::openstack_integration::config::rabbit_port,
'username' => 'barbican',
'password' => 'an_even_bigger_secret',
}),
host_href => "${::openstack_integration::config::base_url}:9311",
auth_strategy => 'keystone',
service_name => 'httpd',
enabled_certificate_plugins => ['simple_certificate'],
db_auto_create => false,
rabbit_userid => 'barbican',
rabbit_password => 'an_even_bigger_secret',
rabbit_port => $::openstack_integration::config::rabbit_port,
rabbit_use_ssl => $::openstack_integration::config::ssl,
rabbit_host => $::openstack_integration::config::ip_for_url,
}
include ::apache
class { '::barbican::wsgi::apache':

19
manifests/ceilometer.pp
View File

@ -26,14 +26,17 @@ class openstack_integration::ceilometer {
}
class { '::ceilometer':
telemetry_secret => 'secrete',
rabbit_userid => 'ceilometer',
rabbit_password => 'an_even_bigger_secret',
rabbit_host => $::openstack_integration::config::ip_for_url,
rabbit_port => $::openstack_integration::config::rabbit_port,
rabbit_use_ssl => $::openstack_integration::config::ssl,
memcached_servers => $::openstack_integration::config::memcached_servers,
debug => true,
telemetry_secret => 'secrete',
default_transport_url => os_transport_url({
'transport' => 'rabbit',
'host' => $::openstack_integration::config::host,
'port' => $::openstack_integration::config::rabbit_port,
'username' => 'ceilometer',
'password' => 'an_even_bigger_secret',
}),
rabbit_use_ssl => $::openstack_integration::config::ssl,
memcached_servers => $::openstack_integration::config::memcached_servers,
debug => true,
}
class { '::ceilometer::db::mysql':
password => 'ceilometer',

17
manifests/cinder.pp
View File

@ -59,13 +59,16 @@ class openstack_integration::cinder (
password => 'a_big_secret',
}
class { '::cinder':
database_connection => 'mysql+pymysql://cinder:cinder@127.0.0.1/cinder?charset=utf8',
rabbit_host => $::openstack_integration::config::ip_for_url,
rabbit_port => $::openstack_integration::config::rabbit_port,
rabbit_userid => 'cinder',
rabbit_password => 'an_even_bigger_secret',
rabbit_use_ssl => $::openstack_integration::config::ssl,
debug => true,
default_transport_url => os_transport_url({
'transport' => 'rabbit',
'host' => $::openstack_integration::config::host,
'port' => $::openstack_integration::config::rabbit_port,
'username' => 'cinder',
'password' => 'an_even_bigger_secret',
}),
database_connection => 'mysql+pymysql://cinder:cinder@127.0.0.1/cinder?charset=utf8',
rabbit_use_ssl => $::openstack_integration::config::ssl,
debug => true,
}
if $volume_encryption {
$keymgr_api_class = 'castellan.key_manager.barbican_key_manager.BarbicanKeyManager'

9
manifests/designate.pp
View File

@ -30,6 +30,15 @@ class openstack_integration::designate {
rabbit_password => 'an_even_bigger_secret',
rabbit_host => $::openstack_integration::config::ip_for_url,
rabbit_port => $::openstack_integration::config::rabbit_port,
# TODO(aschultz): switch after ubuntu updates designate to a version
# that works with this.
#default_transport_url => os_transport_url({
# 'transport' => 'rabbit',
# 'host' => $::openstack_integration::config::host,
# 'port' => $::openstack_integration::config::rabbit_port,
# 'username' => 'designate',
# 'password' => 'an_even_bigger_secret',
#}),
rabbit_use_ssl => $::openstack_integration::config::ssl,
debug => true,
}

15
manifests/glance.pp
View File

@ -120,12 +120,15 @@ class openstack_integration::glance (
key_file => $key_file,
}
class { '::glance::notify::rabbitmq':
rabbit_userid => 'glance',
rabbit_password => 'an_even_bigger_secret',
rabbit_host => $::openstack_integration::config::ip_for_url,
rabbit_port => $::openstack_integration::config::rabbit_port,
notification_driver => 'messagingv2',
rabbit_use_ssl => $::openstack_integration::config::ssl,
default_transport_url => os_transport_url({
'transport' => 'rabbit',
'host' => $::openstack_integration::config::host,
'port' => $::openstack_integration::config::rabbit_port,
'username' => 'glance',
'password' => 'an_even_bigger_secret',
}),
notification_driver => 'messagingv2',
rabbit_use_ssl => $::openstack_integration::config::ssl,
}
}

17
manifests/heat.pp
View File

@ -39,13 +39,16 @@ class openstack_integration::heat {
memcached_servers => $::openstack_integration::config::memcached_servers,
}
class { '::heat':
rabbit_userid => 'heat',
rabbit_password => 'an_even_bigger_secret',
rabbit_host => $::openstack_integration::config::ip_for_url,
rabbit_use_ssl => $::openstack_integration::config::ssl,
rabbit_port => $::openstack_integration::config::rabbit_port,
database_connection => 'mysql+pymysql://heat:heat@127.0.0.1/heat?charset=utf8',
debug => true,
default_transport_url => os_transport_url({
'transport' => 'rabbit',
'host' => $::openstack_integration::config::host,
'port' => $::openstack_integration::config::rabbit_port,
'username' => 'heat',
'password' => 'an_even_bigger_secret',
}),
rabbit_use_ssl => $::openstack_integration::config::ssl,
database_connection => 'mysql+pymysql://heat:heat@127.0.0.1/heat?charset=utf8',
debug => true,
}
class { '::heat::db::mysql':
password => 'heat',

19
manifests/ironic.pp
View File

@ -29,14 +29,17 @@ class openstack_integration::ironic {
Rabbitmq_user_permissions['ironic@/'] -> Service<| tag == 'ironic-service' |>
class { '::ironic':
rabbit_userid => 'ironic',
rabbit_password => 'an_even_bigger_secret',
rabbit_host => $::openstack_integration::config::ip_for_url,
rabbit_port => $::openstack_integration::config::rabbit_port,
rabbit_use_ssl => $::openstack_integration::config::ssl,
database_connection => 'mysql+pymysql://ironic:ironic@127.0.0.1/ironic?charset=utf8',
debug => true,
enabled_drivers => ['fake', 'pxe_ssh', 'pxe_ipmitool'],
default_transport_url => os_transport_url({
'transport' => 'rabbit',
'host' => $::openstack_integration::config::host,
'port' => $::openstack_integration::config::rabbit_port,
'username' => 'ironic',
'password' => 'an_even_bigger_secret',
}),
rabbit_use_ssl => $::openstack_integration::config::ssl,
database_connection => 'mysql+pymysql://ironic:ironic@127.0.0.1/ironic?charset=utf8',
debug => true,
enabled_drivers => ['fake', 'pxe_ssh', 'pxe_ipmitool'],
}
class { '::ironic::db::mysql':
password => 'ironic',

23
manifests/mistral.pp
View File

@ -27,17 +27,20 @@ class openstack_integration::mistral {
Exec['update-ca-certificates'] ~> Service['httpd']
}
class { '::mistral':
database_connection => 'mysql+pymysql://mistral:mistral@127.0.0.1/mistral?charset=utf8',
keystone_password => 'a_big_secret',
rabbit_userid => 'mistral',
rabbit_password => 'an_even_bigger_secret',
rabbit_port => $::openstack_integration::config::rabbit_port,
rabbit_use_ssl => $::openstack_integration::config::ssl,
rabbit_host => $::openstack_integration::config::ip_for_url,
default_transport_url => os_transport_url({
'transport' => 'rabbit',
'host' => $::openstack_integration::config::host,
'port' => $::openstack_integration::config::rabbit_port,
'username' => 'mistral',
'password' => 'an_even_bigger_secret',
}),
database_connection => 'mysql+pymysql://mistral:mistral@127.0.0.1/mistral?charset=utf8',
keystone_password => 'a_big_secret',
rabbit_use_ssl => $::openstack_integration::config::ssl,
# if it works, we might need to change the default in puppet-mistral
identity_uri => $::openstack_integration::config::keystone_admin_uri,
auth_uri => "${::openstack_integration::config::keystone_auth_uri}/v3",
debug => true,
identity_uri => $::openstack_integration::config::keystone_admin_uri,
auth_uri => "${::openstack_integration::config::keystone_auth_uri}/v3",
debug => true,
}
class { '::mistral::keystone::auth':
public_url => "${::openstack_integration::config::base_url}:8989/v2",

43
manifests/murano.pp
View File

@ -41,26 +41,29 @@ class openstack_integration::murano {
}
class { '::murano':
admin_password => 'a_big_secret',
rabbit_os_user => 'murano',
rabbit_os_password => 'an_even_bigger_secret',
rabbit_os_host => $::openstack_integration::config::ip_for_url,
rabbit_os_use_ssl => $::openstack_integration::config::ssl,
rabbit_os_port => $::openstack_integration::config::rabbit_port,
rabbit_own_user => 'murano_private',
rabbit_own_password => 'an_even_bigger_secret',
rabbit_own_vhost => '/murano',
rabbit_own_host => $::openstack_integration::config::ip_for_url,
rabbit_own_port => $::openstack_integration::config::rabbit_port,
rabbit_own_use_ssl => $::openstack_integration::config::ssl,
database_connection => 'mysql://murano:a_big_secret@127.0.0.1/murano?charset=utf8',
identity_uri => $::openstack_integration::config::keystone_admin_uri,
auth_uri => $::openstack_integration::config::keystone_auth_uri,
use_ssl => $::openstack_integration::config::ssl,
service_host => $::openstack_integration::config::ip_for_url,
cert_file => $crt_file,
key_file => $key_file,
debug => true,
admin_password => 'a_big_secret',
default_transport_url => os_transport_url({
'transport' => 'rabbit',
'host' => $::openstack_integration::config::host,
'port' => $::openstack_integration::config::rabbit_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::ip_for_url,
rabbit_own_port => $::openstack_integration::config::rabbit_port,
rabbit_own_use_ssl => $::openstack_integration::config::ssl,
database_connection => 'mysql://murano:a_big_secret@127.0.0.1/murano?charset=utf8',
identity_uri => $::openstack_integration::config::keystone_admin_uri,
auth_uri => $::openstack_integration::config::keystone_auth_uri,
use_ssl => $::openstack_integration::config::ssl,
service_host => $::openstack_integration::config::ip_for_url,
cert_file => $crt_file,
key_file => $key_file,
debug => true,
}
class { '::murano::api':

11
manifests/neutron.pp
View File

@ -105,10 +105,13 @@ class openstack_integration::neutron (
password => 'a_big_secret',
}
class { '::neutron':
rabbit_user => 'neutron',
rabbit_password => 'an_even_bigger_secret',
rabbit_host => $::openstack_integration::config::ip_for_url,
rabbit_port => $::openstack_integration::config::rabbit_port,
default_transport_url => os_transport_url({
'transport' => 'rabbit',
'host' => $::openstack_integration::config::host,
'port' => $::openstack_integration::config::rabbit_port,
'username' => 'neutron',
'password' => 'an_even_bigger_secret',
}),
rabbit_use_ssl => $::openstack_integration::config::ssl,
allow_overlapping_ips => true,
core_plugin => 'ml2',

11
manifests/nova.pp
View File

@ -66,12 +66,15 @@ class openstack_integration::nova (
memcached_servers => $::openstack_integration::config::memcached_servers,
}
class { '::nova':
default_transport_url => os_transport_url({
'transport' => 'rabbit',
'host' => $::openstack_integration::config::host,
'port' => $::openstack_integration::config::rabbit_port,
'username' => 'nova',
'password' => 'an_even_bigger_secret',
}),
database_connection => 'mysql+pymysql://nova:nova@127.0.0.1/nova?charset=utf8',
api_database_connection => 'mysql+pymysql://nova_api:nova@127.0.0.1/nova_api?charset=utf8',
rabbit_host => $::openstack_integration::config::ip_for_url,
rabbit_port => $::openstack_integration::config::rabbit_port,
rabbit_userid => 'nova',
rabbit_password => 'an_even_bigger_secret',
rabbit_use_ssl => $::openstack_integration::config::ssl,
use_ipv6 => $::openstack_integration::config::ipv6,
glance_api_servers => "${::openstack_integration::config::base_url}:9292",

33
manifests/sahara.pp
View File

@ -29,21 +29,24 @@ class openstack_integration::sahara {
password => 'a_big_secret',
}
class { '::sahara':
host => $::openstack_integration::config::host,
database_connection => 'mysql+pymysql://sahara:sahara@127.0.0.1/sahara?charset=utf8',
rabbit_userid => 'sahara',
rabbit_password => 'an_even_bigger_secret',
rabbit_host => $::openstack_integration::config::ip_for_url,
rabbit_port => $::openstack_integration::config::rabbit_port,
rabbit_use_ssl => $::openstack_integration::config::ssl,
rpc_backend => 'rabbit',
admin_password => 'a_big_secret',
admin_user => 'sahara',
admin_tenant_name => 'services',
debug => true,
auth_uri => "${::openstack_integration::config::keystone_admin_uri}/v2.0",
identity_uri => $::openstack_integration::config::keystone_admin_uri,
memcached_servers => $::openstack_integration::config::memcached_servers,
host => $::openstack_integration::config::host,
database_connection => 'mysql+pymysql://sahara:sahara@127.0.0.1/sahara?charset=utf8',
default_transport_url => os_transport_url({
'transport' => 'rabbit',
'host' => $::openstack_integration::config::host,
'port' => $::openstack_integration::config::rabbit_port,
'username' => 'sahara',
'password' => 'an_even_bigger_secret',
}),
rabbit_use_ssl => $::openstack_integration::config::ssl,
rpc_backend => 'rabbit',
admin_password => 'a_big_secret',
admin_user => 'sahara',
admin_tenant_name => 'services',
debug => true,
auth_uri => "${::openstack_integration::config::keystone_admin_uri}/v2.0",
identity_uri => $::openstack_integration::config::keystone_admin_uri,
memcached_servers => $::openstack_integration::config::memcached_servers,
}
class { '::sahara::service::api':
api_workers => 2,

11
manifests/trove.pp
View File

@ -31,11 +31,14 @@ class openstack_integration::trove {
}
class { '::trove':
default_transport_url => os_transport_url({
'transport' => 'rabbit',
'host' => $::openstack_integration::config::host,
'port' => $::openstack_integration::config::rabbit_port,
'username' => 'trove',
'password' => 'an_even_bigger_secret',
}),
database_connection => 'mysql+pymysql://trove:trove@127.0.0.1/trove?charset=utf8',
rabbit_userid => 'trove',
rabbit_password => 'an_even_bigger_secret',
rabbit_host => $::openstack_integration::config::ip_for_url,
rabbit_port => $::openstack_integration::config::rabbit_port,
rabbit_use_ssl => $::openstack_integration::config::ssl,
nova_proxy_admin_pass => 'a_big_secret',
}