openstack
/
puppet-designate
Code Issues Proposed changes

Change to relative includes 

Change-Id: Iff7244802a04967f1a4f06d2241118445510ac7b
This commit is contained in:
Tobias Urdin 2020-07-13 21:18:50 +02:00
parent e2213058b1
commit 2e08a20412
4 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
example/all-in-one-keystone.pp
View File

@ -6,9 +6,9 @@
# #
node /designate/ { node /designate/ {
include '::apt' include apt
include '::rabbitmq' include rabbitmq
include '::mysql::server' include mysql::server
# Keystone parameters # Keystone parameters
$keystone_db_host = '127.0.0.1' $keystone_db_host = '127.0.0.1'
@ -50,11 +50,11 @@ node /designate/ {
# == Designate == # # == Designate == #
class {'::designate::db::mysql': class {'designate::db::mysql':
password => $designate_db_password, password => $designate_db_password,
} }
class {'::designate': class {'designate':
default_transport_url => os_transport_url({ default_transport_url => os_transport_url({
'transport' => 'rabbit', 'transport' => 'rabbit',
'host' => '127.0.0.1', 'host' => '127.0.0.1',
@ -64,25 +64,25 @@ node /designate/ {
}), }),
} }
class {'::designate::db': class {'designate::db':
database_connection => "mysql://designate:${designate_db_password}@${db_host}/designate" database_connection => "mysql://designate:${designate_db_password}@${db_host}/designate"
} }
include '::designate::client' include designate::client
class {'::designate::api': class {'designate::api':
auth_strategy => $auth_strategy, auth_strategy => $auth_strategy,
keystone_password => $keystone_password, keystone_password => $keystone_password,
} }
include '::designate::central' include designate::central
include '::designate::dns' include designate::dns
class {'::designate::backend::bind9': class {'designate::backend::bind9':
rndc_config_file => '', rndc_config_file => '',
rndc_key_file => '', rndc_key_file => '',
} }
class {'::designate::keystone::auth': class {'designate::keystone::auth':
password => $keystone_password, password => $keystone_password,
} }
} }

20
example/all-in-one-noauth.pp
View File

@ -1,8 +1,8 @@
node /designate/ { node /designate/ {
include '::apt' include apt
include '::rabbitmq' include rabbitmq
include '::mysql::server' include mysql::server
# This example would install designate api and designate central service # This example would install designate api and designate central service
$auth_strategy = 'noauth' $auth_strategy = 'noauth'
@ -10,15 +10,15 @@ node /designate/ {
$db_host = '127.0.0.1' $db_host = '127.0.0.1'
include '::designate::dns' include designate::dns
include '::designate::backend::bind9' include designate::backend::bind9
class {'::designate::db::mysql': class {'designate::db::mysql':
password => $designate_db_password, password => $designate_db_password,
} }
class {'::designate': class {'designate':
default_transport_url => os_transport_url({ default_transport_url => os_transport_url({
'transport' => 'rabbit', 'transport' => 'rabbit',
'host' => '127.0.0.1', 'host' => '127.0.0.1',
@ -28,13 +28,13 @@ node /designate/ {
}), }),
} }
class {'::designate::db': class {'designate::db':
database_connection => "mysql://designate:${designate_db_password}@${db_host}/designate" database_connection => "mysql://designate:${designate_db_password}@${db_host}/designate"
} }
class {'::designate::api': class {'designate::api':
auth_strategy => $auth_strategy, auth_strategy => $auth_strategy,
} }
include '::designate::central' include designate::central
} }

2
manifests/client.pp
View File

@ -25,6 +25,6 @@ class designate::client (
tag => 'openstack', tag => 'openstack',
} }
include '::openstacklib::openstackclient' include openstacklib::openstackclient
} }

4
manifests/db.pp
View File

@ -59,8 +59,8 @@ class designate::db (
case $database_connection { case $database_connection {
/^mysql(\+pymysql)?:\/\//: { /^mysql(\+pymysql)?:\/\//: {
require '::mysql::bindings' require mysql::bindings
require '::mysql::bindings::python' require mysql::bindings::python
if $database_connection =~ /^mysql\+pymysql/ { if $database_connection =~ /^mysql\+pymysql/ {
$backend_package = $::designate::params::pymysql_package_name $backend_package = $::designate::params::pymysql_package_name
} else { } else {