Merge "Ubuntu: Re-enable watcher in acceptance tests"

spec/acceptance/10_basic_watcher_spec.rb

@@ -14,11 +14,7 @@ describe 'basic watcher' do
       include openstack_integration::memcached
       include openstack_integration::keystone
 
-      # TODO(aschultz): fix after Ubuntu ocata-m3/rc1. watcher-db-manage is
-      # broken
-      if ($::osfamily == 'RedHat') {
-        include openstack_integration::watcher
-      }
+      include openstack_integration::watcher
       EOS
 
       # Run it twice and test for idempotency
@@ -26,10 +22,8 @@ describe 'basic watcher' do
       apply_manifest(pp, :catch_changes => true)
     end
 
-    if os[:family].casecmp('RedHat') == 0
-      describe port(9322) do
-        it { is_expected.to be_listening }
-      end
+    describe port(9322) do
+      it { is_expected.to be_listening }
     end
   end