openstack/puppet-openstack-integration
Code Issues Proposed changes

Merge "Revert "Disable watcher and murano temporarily""

Browse Source
This commit is contained in:
Jenkins 2017-07-24 11:26:16 +00:00 committed by Gerrit Code Review
commit 44a78a81fa
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
fixtures/scenario003.pp
View File

@ -29,8 +29,7 @@ case $::osfamily {
'RedHat': { 'RedHat': {
$ipv6 = true $ipv6 = true
$mistral_enabled = true $mistral_enabled = true
# re-enable next time we have RDO promotion $murano_enabled = true
$murano_enabled = false
$sahara_enabled = true $sahara_enabled = true
$trove_enabled = true $trove_enabled = true
} }

4
fixtures/scenario004.pp
View File

@ -25,9 +25,7 @@ if $::operatingsystem == 'Ubuntu' {
} else { } else {
$ssl_enabled = true $ssl_enabled = true
$ipv6 = true $ipv6 = true
# TODO(aschultz): enable once https://review.rdoproject.org/r/#/c/6491/ is $watcher_enabled = true
# promoted
$watcher_enabled = false
$bgpvpn_enabled = true $bgpvpn_enabled = true
} }