openstack/puppet-openstack-integration
Code Issues Proposed changes

scenario004: disable watcher

Browse Source 
Watcher introduced a new dependency with:
a015af1bd2

But RDO doesn't have any package for Monasca yet.
Let's disable Watcher until packages are built in RDO and dependencies
are fixed.

Change-Id: I321e7830aa3a94e23dac422470ba98a63a666fab
This commit is contained in:
Emilien Macchi 2017-01-16 13:41:48 -05:00
parent b095924bc5
commit 591f3c7c1f
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
README.md
View File

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