openstack/puppet-openstack-integration
Code Issues Proposed changes

MySQL: Use appropriate IP version

Browse Source 
Currently we always use IPv4 for MySQL even in the test cases which are
supposed to use IPv6. This fixes that and ensures the expected ip
version is used.

Change-Id: I483f04376f29b75dcca20061ae381c7e71f26caf
This commit is contained in:
Takashi Kajinami 2023-02-24 14:05:02 +09:00
parent d4780c3823
commit b123f825b6
24 changed files with 237 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
manifests/aodh.pp
View File

@ -28,7 +28,14 @@ class openstack_integration::aodh (
debug => true,
}
class { 'aodh::db':
database_connection => 'mysql+pymysql://aodh:aodh@127.0.0.1/aodh?charset=utf8',
database_connection => os_database_connection({
'dialect' => 'mysql+pymysql',
'host' => $::openstack_integration::config::ip_for_url,
'username' => 'aodh',
'password' => 'aodh',
'database' => 'aodh',
'charset' => 'utf8',
}),
}
class { 'aodh':
default_transport_url => os_transport_url({
@ -54,6 +61,7 @@ class openstack_integration::aodh (
charset => $::openstack_integration::params::mysql_charset,
collate => $::openstack_integration::params::mysql_collate,
password => 'aodh',
host => $::openstack_integration::config::host,
}
class { 'aodh::keystone::auth':
public_url => "${::openstack_integration::config::base_url}:8042",

10
manifests/barbican.pp
View File

@ -21,9 +21,17 @@ class openstack_integration::barbican {
charset => $::openstack_integration::params::mysql_charset,
collate => $::openstack_integration::params::mysql_collate,
password => 'barbican',
host => $::openstack_integration::config::host,
}
class { 'barbican::db':
database_connection => 'mysql+pymysql://barbican:barbican@127.0.0.1/barbican?charset=utf8',
database_connection => os_database_connection({
'dialect' => 'mysql+pymysql',
'host' => $::openstack_integration::config::ip_for_url,
'username' => 'barbican',
'password' => 'barbican',
'database' => 'barbican',
'charset' => 'utf8',
}),
}
class { 'barbican::keystone::auth':
public_url => "${::openstack_integration::config::base_url}:9311",

10
manifests/cinder.pp
View File

@ -45,6 +45,7 @@ class openstack_integration::cinder (
charset => $::openstack_integration::params::mysql_charset,
collate => $::openstack_integration::params::mysql_collate,
password => 'cinder',
host => $::openstack_integration::config::host,
}
class { 'cinder::keystone::auth':
public_url_v3 => "${::openstack_integration::config::base_url}:8776/v3",
@ -65,7 +66,14 @@ class openstack_integration::cinder (
}
}
class { 'cinder::db':
database_connection => 'mysql+pymysql://cinder:cinder@127.0.0.1/cinder?charset=utf8',
database_connection => os_database_connection({
'dialect' => 'mysql+pymysql',
'host' => $::openstack_integration::config::ip_for_url,
'username' => 'cinder',
'password' => 'cinder',
'database' => 'cinder',
'charset' => 'utf8',
}),
}
class { 'cinder':
default_transport_url => os_transport_url({

10
manifests/designate.pp
View File

@ -24,6 +24,7 @@ class openstack_integration::designate {
charset => $::openstack_integration::params::mysql_charset,
collate => $::openstack_integration::params::mysql_collate,
password => 'designate',
host => $::openstack_integration::config::host,
}
class { 'designate::logging':
debug => true,
@ -39,7 +40,14 @@ class openstack_integration::designate {
rabbit_use_ssl => $::openstack_integration::config::ssl,
}
class { 'designate::db':
database_connection => 'mysql+pymysql://designate:designate@127.0.0.1/designate?charset=utf8'
database_connection => os_database_connection({
'dialect' => 'mysql+pymysql',
'host' => $::openstack_integration::config::ip_for_url,
'username' => 'designate',
'password' => 'designate',
'database' => 'designate',
'charset' => 'utf8',
}),
}
class { 'designate::coordination':
backend_url => $::openstack_integration::config::tooz_url,

10
manifests/ec2api.pp
View File

@ -15,11 +15,19 @@ class openstack_integration::ec2api {
charset => $::openstack_integration::params::mysql_charset,
collate => $::openstack_integration::params::mysql_collate,
password => 'ec2api',
host => $::openstack_integration::config::host,
}
case $::osfamily {
'RedHat': {
class { 'ec2api::db':
database_connection => 'mysql+pymysql://ec2api:ec2api@127.0.0.1/ec2api?charset=utf8',
database_connection => os_database_connection({
'dialect' => 'mysql+pymysql',
'host' => $::openstack_integration::config::ip_for_url,
'username' => 'ec2api',
'password' => 'ec2api',
'database' => 'ec2api',
'charset' => 'utf8',
}),
}
class { 'ec2api::db::sync': }
class { 'ec2api::logging':

10
manifests/glance.pp
View File

@ -38,6 +38,7 @@ class openstack_integration::glance (
charset => $::openstack_integration::params::mysql_charset,
collate => $::openstack_integration::params::mysql_collate,
password => 'glance',
host => $::openstack_integration::config::host,
}
include glance
include glance::client
@ -99,7 +100,14 @@ class openstack_integration::glance (
debug => true,
}
class { 'glance::api::db':
database_connection => 'mysql+pymysql://glance:glance@127.0.0.1/glance?charset=utf8',
database_connection => os_database_connection({
'dialect' => 'mysql+pymysql',
'host' => $::openstack_integration::config::ip_for_url,
'username' => 'glance',
'password' => 'glance',
'database' => 'glance',
'charset' => 'utf8',
}),
}
class { 'glance::api':
workers => 2,

10
manifests/gnocchi.pp
View File

@ -35,7 +35,14 @@ class openstack_integration::gnocchi (
debug => true,
}
class { 'gnocchi::db':
database_connection => 'mysql+pymysql://gnocchi:gnocchi@127.0.0.1/gnocchi?charset=utf8',
database_connection => os_database_connection({
'dialect' => 'mysql+pymysql',
'host' => $::openstack_integration::config::ip_for_url,
'username' => 'gnocchi',
'password' => 'gnocchi',
'database' => 'gnocchi',
'charset' => 'utf8',
}),
}
class { 'gnocchi':
coordination_url => $::openstack_integration::config::tooz_url,
@ -44,6 +51,7 @@ class openstack_integration::gnocchi (
charset => $::openstack_integration::params::mysql_charset,
collate => $::openstack_integration::params::mysql_collate,
password => 'gnocchi',
host => $::openstack_integration::config::host,
}
# TODO(tkajinam): We need to find a way to enforce swift is up before

10
manifests/heat.pp
View File

@ -46,7 +46,14 @@ class openstack_integration::heat (
debug => true,
}
class { 'heat::db':
database_connection => 'mysql+pymysql://heat:heat@127.0.0.1/heat?charset=utf8',
database_connection => os_database_connection({
'dialect' => 'mysql+pymysql',
'host' => $::openstack_integration::config::ip_for_url,
'username' => 'heat',
'password' => 'heat',
'database' => 'heat',
'charset' => 'utf8',
}),
}
class { 'heat':
default_transport_url => os_transport_url({
@ -72,6 +79,7 @@ class openstack_integration::heat (
charset => $::openstack_integration::params::mysql_charset,
collate => $::openstack_integration::params::mysql_collate,
password => 'heat',
host => $::openstack_integration::config::host,
}
class { 'heat::keystone::auth':
password => 'a_big_secret',

22
manifests/ironic.pp
View File

@ -19,7 +19,14 @@ class openstack_integration::ironic {
debug => true,
}
class { 'ironic::db':
database_connection => 'mysql+pymysql://ironic:ironic@127.0.0.1/ironic?charset=utf8',
database_connection => os_database_connection({
'dialect' => 'mysql+pymysql',
'host' => $::openstack_integration::config::ip_for_url,
'username' => 'ironic',
'password' => 'ironic',
'database' => 'ironic',
'charset' => 'utf8',
}),
}
class { 'ironic':
default_transport_url => os_transport_url({
@ -36,6 +43,7 @@ class openstack_integration::ironic {
charset => $::openstack_integration::params::mysql_charset,
collate => $::openstack_integration::params::mysql_collate,
password => 'ironic',
host => $::openstack_integration::config::host,
}
class { 'ironic::keystone::auth':
public_url => "${::openstack_integration::config::base_url}:6385",
@ -82,7 +90,8 @@ class openstack_integration::ironic {
class { 'ironic::inspector::db::mysql':
charset => $::openstack_integration::params::mysql_charset,
collate => $::openstack_integration::params::mysql_collate,
password => 'a_big_secret',
password => 'ironic-inspector',
host => $::openstack_integration::config::host,
}
class { 'ironic::inspector::authtoken':
password => 'a_big_secret',
@ -94,7 +103,14 @@ class openstack_integration::ironic {
}
class { 'ironic::pxe': }
class { 'ironic::inspector::db':
database_connection => 'mysql+pymysql://ironic-inspector:a_big_secret@127.0.0.1/ironic-inspector?charset=utf8',
database_connection => os_database_connection({
'dialect' => 'mysql+pymysql',
'host' => $::openstack_integration::config::ip_for_url,
'username' => 'ironic-inspector',
'password' => 'ironic-inspector',
'database' => 'ironic-inspector',
'charset' => 'utf8',
}),
}
class { 'ironic::inspector::ironic':
password => 'a_big_secret',

10
manifests/keystone.pp
View File

@ -47,9 +47,17 @@ class openstack_integration::keystone (
charset => $::openstack_integration::params::mysql_charset,
collate => $::openstack_integration::params::mysql_collate,
password => 'keystone',
host => $::openstack_integration::config::host,
}
class { 'keystone::db':
database_connection => 'mysql+pymysql://keystone:keystone@127.0.0.1/keystone',
database_connection => os_database_connection({
'dialect' => 'mysql+pymysql',
'host' => $::openstack_integration::config::ip_for_url,
'username' => 'keystone',
'password' => 'keystone',
'database' => 'keystone',
'charset' => 'utf8',
}),
}
class { 'keystone::logging':
debug => true,

10
manifests/magnum.pp
View File

@ -58,10 +58,18 @@ class openstack_integration::magnum (
charset => $::openstack_integration::params::mysql_charset,
collate => $::openstack_integration::params::mysql_collate,
password => 'magnum',
host => $::openstack_integration::config::host,
}
class { 'magnum::db':
database_connection => 'mysql+pymysql://magnum:magnum@127.0.0.1/magnum',
database_connection => os_database_connection({
'dialect' => 'mysql+pymysql',
'host' => $::openstack_integration::config::ip_for_url,
'username' => 'magnum',
'password' => 'magnum',
'database' => 'magnum',
'charset' => 'utf8',
}),
}
class { 'magnum::keystone::domain':

10
manifests/manila.pp
View File

@ -34,6 +34,7 @@ class openstack_integration::manila (
charset => $::openstack_integration::params::mysql_charset,
collate => $::openstack_integration::params::mysql_collate,
password => 'manila',
host => $::openstack_integration::config::host,
}
class { 'manila::keystone::auth':
public_url => "${::openstack_integration::config::base_url}:8786/v1/%(tenant_id)s",
@ -50,7 +51,14 @@ class openstack_integration::manila (
debug => true,
}
class { 'manila::db':
database_connection => 'mysql+pymysql://manila:manila@127.0.0.1/manila?charset=utf8',
database_connection => os_database_connection({
'dialect' => 'mysql+pymysql',
'host' => $::openstack_integration::config::ip_for_url,
'username' => 'manila',
'password' => 'manila',
'database' => 'manila',
'charset' => 'utf8',
}),
}
class { 'manila':
default_transport_url => os_transport_url({

10
manifests/mistral.pp
View File

@ -26,7 +26,14 @@ class openstack_integration::mistral {
debug => true,
}
class { 'mistral::db':
database_connection => 'mysql+pymysql://mistral:mistral@127.0.0.1/mistral?charset=utf8',
database_connection => os_database_connection({
'dialect' => 'mysql+pymysql',
'host' => $::openstack_integration::config::ip_for_url,
'username' => 'mistral',
'password' => 'mistral',
'database' => 'mistral',
'charset' => 'utf8',
}),
}
class { 'mistral':
default_transport_url => os_transport_url({
@ -48,6 +55,7 @@ class openstack_integration::mistral {
charset => $::openstack_integration::params::mysql_charset,
collate => $::openstack_integration::params::mysql_collate,
password => 'mistral',
host => $::openstack_integration::config::host,
}
class { 'mistral::api':
service_name => 'httpd',

12
manifests/murano.pp
View File

@ -42,13 +42,21 @@ class openstack_integration::murano {
class { 'murano::db::mysql':
charset => $::openstack_integration::params::mysql_charset,
collate => $::openstack_integration::params::mysql_collate,
password => 'a_big_secret',
password => 'murano',
host => $::openstack_integration::config::host,
}
class { 'murano::logging':
debug => true,
}
class { 'murano::db':
database_connection => 'mysql+pymysql://murano:a_big_secret@127.0.0.1/murano?charset=utf8',
database_connection => os_database_connection({
'dialect' => 'mysql+pymysql',
'host' => $::openstack_integration::config::ip_for_url,
'username' => 'murano',
'password' => 'murano',
'database' => 'murano',
'charset' => 'utf8',
}),
}
class { 'murano::keystone::authtoken':
password => 'a_big_secret',

10
manifests/mysql.pp
View File

@ -1,5 +1,13 @@
class openstack_integration::mysql {
class { 'mysql::server': }
include openstack_integration::config
class { 'mysql::server':
override_options => {
'mysqld' => {
'bind-address' => $::openstack_integration::config::host,
},
},
}
}

10
manifests/neutron.pp
View File

@ -100,6 +100,7 @@ class openstack_integration::neutron (
charset => $::openstack_integration::params::mysql_charset,
collate => $::openstack_integration::params::mysql_collate,
password => 'neutron',
host => $::openstack_integration::config::host,
}
class { 'neutron::keystone::auth':
public_url => "${::openstack_integration::config::base_url}:9696",
@ -205,7 +206,14 @@ class openstack_integration::neutron (
}
class { 'neutron::db':
database_connection => 'mysql+pymysql://neutron:neutron@127.0.0.1/neutron?charset=utf8',
database_connection => os_database_connection({
'dialect' => 'mysql+pymysql',
'host' => $::openstack_integration::config::ip_for_url,
'username' => 'neutron',
'password' => 'neutron',
'database' => 'neutron',
'charset' => 'utf8',
}),
}
class { 'neutron::server':
sync_db => true,

20
manifests/nova.pp
View File

@ -66,11 +66,13 @@ class openstack_integration::nova (
charset => $::openstack_integration::params::mysql_charset,
collate => $::openstack_integration::params::mysql_collate,
password => 'nova',
host => $::openstack_integration::config::host,
}
class { 'nova::db::mysql_api':
charset => $::openstack_integration::params::mysql_charset,
collate => $::openstack_integration::params::mysql_collate,
password => 'nova',
host => $::openstack_integration::config::host,
}
include nova::cell_v2::simple_setup
@ -102,8 +104,22 @@ class openstack_integration::nova (
debug => true,
}
class { 'nova::db':
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',
database_connection => os_database_connection({
'dialect' => 'mysql+pymysql',
'host' => $::openstack_integration::config::ip_for_url,
'username' => 'nova',
'password' => 'nova',
'database' => 'nova',
'charset' => 'utf8',
}),
api_database_connection => os_database_connection({
'dialect' => 'mysql+pymysql',
'host' => $::openstack_integration::config::ip_for_url,
'username' => 'nova_api',
'password' => 'nova',
'database' => 'nova_api',
'charset' => 'utf8',
}),
}
class { 'nova':
default_transport_url => $default_transport_url,

10
manifests/octavia.pp
View File

@ -33,7 +33,14 @@ class openstack_integration::octavia (
debug => true,
}
class { 'octavia::db':
database_connection => 'mysql+pymysql://octavia:octavia@127.0.0.1/octavia?charset=utf8',
database_connection => os_database_connection({
'dialect' => 'mysql+pymysql',
'host' => $::openstack_integration::config::ip_for_url,
'username' => 'octavia',
'password' => 'octavia',
'database' => 'octavia',
'charset' => 'utf8',
}),
}
class { 'octavia':
default_transport_url => os_transport_url({
@ -59,6 +66,7 @@ class openstack_integration::octavia (
charset => $::openstack_integration::params::mysql_charset,
collate => $::openstack_integration::params::mysql_collate,
password => 'octavia',
host => $::openstack_integration::config::host,
}
class { 'octavia::keystone::auth':
public_url => "${::openstack_integration::config::base_url}:9876",

10
manifests/placement.pp
View File

@ -19,6 +19,7 @@ class openstack_integration::placement {
charset => $::openstack_integration::params::mysql_charset,
collate => $::openstack_integration::params::mysql_collate,
password => 'placement',
host => $::openstack_integration::config::host,
}
class { 'placement::keystone::auth':
@ -39,7 +40,14 @@ class openstack_integration::placement {
debug => true,
}
class { 'placement::db':
database_connection => 'mysql+pymysql://placement:placement@127.0.0.1/placement?charset=utf8',
database_connection => os_database_connection({
'dialect' => 'mysql+pymysql',
'host' => $::openstack_integration::config::ip_for_url,
'username' => 'placement',
'password' => 'placement',
'database' => 'placement',
'charset' => 'utf8',
}),
}
include placement::db::sync
# TODO(tkajinam): Remove this once lp bug 1987984 is fixed.

10
manifests/sahara.pp
View File

@ -28,6 +28,7 @@ class openstack_integration::sahara (
charset => $::openstack_integration::params::mysql_charset,
collate => $::openstack_integration::params::mysql_collate,
password => 'sahara',
host => $::openstack_integration::config::host,
}
class { 'sahara::keystone::auth':
@ -40,7 +41,14 @@ class openstack_integration::sahara (
debug => true,
}
class { 'sahara::db':
database_connection => 'mysql+pymysql://sahara:sahara@127.0.0.1/sahara?charset=utf8',
database_connection => os_database_connection({
'dialect' => 'mysql+pymysql',
'host' => $::openstack_integration::config::ip_for_url,
'username' => 'sahara',
'password' => 'sahara',
'database' => 'sahara',
'charset' => 'utf8',
}),
}
class { 'sahara':
host => $::openstack_integration::config::host,

10
manifests/trove.pp
View File

@ -25,7 +25,14 @@ class openstack_integration::trove {
debug => true,
}
class { 'trove::db':
database_connection => 'mysql+pymysql://trove:trove@127.0.0.1/trove?charset=utf8',
database_connection => os_database_connection({
'dialect' => 'mysql+pymysql',
'host' => $::openstack_integration::config::ip_for_url,
'username' => 'trove',
'password' => 'trove',
'database' => 'trove',
'charset' => 'utf8',
}),
}
class { 'trove':
default_transport_url => os_transport_url({
@ -49,6 +56,7 @@ class openstack_integration::trove {
charset => $::openstack_integration::params::mysql_charset,
collate => $::openstack_integration::params::mysql_collate,
password => 'trove',
host => $::openstack_integration::config::host,
}
class { 'trove::keystone::auth':
password => 'a_big_secret',

10
manifests/vitrage.pp
View File

@ -20,10 +20,18 @@ class openstack_integration::vitrage {
charset => $::openstack_integration::params::mysql_charset,
collate => $::openstack_integration::params::mysql_collate,
password => 'vitrage',
host => $::openstack_integration::config::host,
}
class { 'vitrage::db':
database_connection => 'mysql+pymysql://vitrage:vitrage@127.0.0.1/vitrage?charset=utf8'
database_connection => os_database_connection({
'dialect' => 'mysql+pymysql',
'host' => $::openstack_integration::config::ip_for_url,
'username' => 'vitrage',
'password' => 'vitrage',
'database' => 'vitrage',
'charset' => 'utf8',
}),
}
class { 'vitrage::db::sync': }

10
manifests/watcher.pp
View File

@ -19,9 +19,17 @@ class openstack_integration::watcher {
charset => $::openstack_integration::params::mysql_charset,
collate => $::openstack_integration::params::mysql_collate,
password => 'watcher',
host => $::openstack_integration::config::host,
}
class { 'watcher::db':
database_connection => 'mysql+pymysql://watcher:watcher@127.0.0.1/watcher?charset=utf8',
database_connection => os_database_connection({
'dialect' => 'mysql+pymysql',
'host' => $::openstack_integration::config::ip_for_url,
'username' => 'watcher',
'password' => 'watcher',
'database' => 'watcher',
'charset' => 'utf8',
}),
}
class { 'watcher::keystone::auth':
password => 'a_big_secret',

11
manifests/zaqar.pp
View File

@ -16,6 +16,7 @@ class openstack_integration::zaqar {
charset => $::openstack_integration::params::mysql_charset,
collate => $::openstack_integration::params::mysql_collate,
password => 'zaqar',
host => $::openstack_integration::config::host,
}
class { 'zaqar::keystone::auth':
password => 'a_big_secret',
@ -30,7 +31,15 @@ class openstack_integration::zaqar {
admin_url => "ws://${::openstack_integration::config::ip_for_url}:8888",
}
class {'zaqar::management::sqlalchemy':
uri => 'mysql+pymysql://zaqar:zaqar@127.0.0.1/zaqar?charset=utf8',
uri => os_database_connection({
'dialect' => 'mysql+pymysql',
'host' => $::openstack_integration::config::ip_for_url,
'username' => 'zaqar',
'password' => 'zaqar',
'database' => 'zaqar',
'charset' => 'utf8',
}),
}
class {'zaqar::messaging::swift':
auth_url => "${::openstack_integration::config::keystone_auth_uri}/v3",