openstack/puppet-openstack-integration
Code Issues Proposed changes

Revert "scenario004: disable watcher"

Browse Source 
This reverts commit 591f3c7c1f610659e179254be04b5caca140ff21.

Change-Id: I918b9590b2d13aa04a7367de663db0bd2058a064
This commit is contained in:
Emilien Macchi 2017-02-01 15:54:52 -05:00 committed by David Moreau Simard
parent 067e1a32a9
commit ab0111eeb2
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
README.md
View File

@ -69,6 +69,7 @@ scenario](#all-in-one).
| ceph | X | | | X | | | ceph | X | | | X | |
| ceph rgw | | | | X | | | ceph rgw | | | | X | |
| mongodb | | X | | | | | mongodb | | X | | | |
| watcher | | | | X | |
When the Jenkins slave is created, the *run_tests.sh* script will executed. When the Jenkins slave is created, the *run_tests.sh* script will executed.
This script will execute *install_modules.sh* that prepare /etc/puppet/modules This script will execute *install_modules.sh* that prepare /etc/puppet/modules

4
fixtures/scenario004.pp
View File

@ -23,9 +23,7 @@ if $::operatingsystem == 'Ubuntu' {
} else { } else {
$ssl_enabled = true $ssl_enabled = true
$ipv6 = true $ipv6 = true
# Re-enable Watcher when monascaclient is packaged in RDO and $watcher_enabled = true
# added to Watcher dependencies.
$watcher_enabled = false
} }
include ::openstack_integration include ::openstack_integration