Merge "Revert "Disable watcher and murano temporarily""

fixtures/scenario003.pp

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

fixtures/scenario004.pp

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