Include mistral::db::sync by default

This is done in most other modules and it doesn't make much sense to
setup mistral without it.

Change-Id: I2f8b6ad7ae3e4defefe58ac749b2268d067167b1
This commit is contained in:
Matt Fischer
2016-12-08 15:52:43 -07:00
parent 972b2d319d
commit a9c31d3a57
5 changed files with 17 additions and 2 deletions

View File

@@ -173,6 +173,10 @@
# in the mistral config. # in the mistral config.
# Defaults to false. # Defaults to false.
# #
# [*sync_db*]
# (Optional) Enable dbsync
# Defaults to true.
#
# === DEPRECATED PARAMTERS # === DEPRECATED PARAMTERS
# #
# [*rabbit_host*] # [*rabbit_host*]
@@ -234,6 +238,7 @@ class mistral(
$coordination_backend_url = $::os_service_default, $coordination_backend_url = $::os_service_default,
$coordination_heartbeat_interval = $::os_service_default, $coordination_heartbeat_interval = $::os_service_default,
$purge_config = false, $purge_config = false,
$sync_db = true,
# DEPRECATED PARAMETERS # DEPRECATED PARAMETERS
$rabbit_host = $::os_service_default, $rabbit_host = $::os_service_default,
$rabbit_port = $::os_service_default, $rabbit_port = $::os_service_default,
@@ -312,4 +317,8 @@ deprecated. Please use mistral::default_transport_url instead.")
} else { } else {
mistral_config { 'DEFAULT/rpc_backend': value => $rpc_backend } mistral_config { 'DEFAULT/rpc_backend': value => $rpc_backend }
} }
if $sync_db {
include ::mistral::db::sync
}
} }

View File

@@ -0,0 +1,4 @@
---
features:
- By default the mistral::db::sync class will be included
This can be disable by setting mistral::sync_db to false.

View File

@@ -0,0 +1,4 @@
---
features:
- The class mistral::db::sync will be included by default.
This matches what most other modules do.

View File

@@ -55,7 +55,6 @@ describe 'basic mistral' do
class { '::mistral::client': } class { '::mistral::client': }
class { '::mistral::engine': } class { '::mistral::engine': }
class { '::mistral::executor': } class { '::mistral::executor': }
class { '::mistral::db::sync': }
} }
} }
EOS EOS

View File

@@ -5,7 +5,6 @@ describe 'mistral::db::mysql' do
let :pre_condition do let :pre_condition do
[ [
'include mysql::server', 'include mysql::server',
'include mistral::db::sync'
] ]
end end