From 05a6bba1af3c6827069f42d88b883fed72514f8f Mon Sep 17 00:00:00 2001
From: Emilien Macchi <emilien@redhat.com>
Date: Tue, 28 Feb 2017 22:34:55 -0500
Subject: [PATCH] Align the stars

CI is currently flacky / broken.

1. ubuntu: exclude test_create_show_delete_firewall from tempest
https://github.com/openstack/tempest/commit/f2088f3b7b28b9d9eae3ee5c4757f2beac0aaf6a
This patch broke us when running Tempest with Ubuntu Ocata.

 File "/usr/lib/python2.7/dist-packages/neutron_fwaas/tests/tempest_plugin/tests/api/test_fwaas_extensions.py", line 102, in _wait_until_ready
  if not test.call_until_true(_wait, CONF.network.build_timeout,
AttributeError: 'module' object has no attribute 'call_until_true'

2. Start Designate services after RabbitMQ resources are ready
This makes sure Designate services can start correctly at first Puppet
run and make second Puppet run idempotent.

3. Disable vitrage which is unstable now, until we figure out what's
wrong with configuration. It seems related to auth parameters.

Change-Id: I84921cbf4f4f838bff4f970113e709181801bed9
---
 fixtures/scenario001.pp | 3 ++-
 manifests/designate.pp  | 2 ++
 run_tests.sh            | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/fixtures/scenario001.pp b/fixtures/scenario001.pp
index a8dae02a1..ba3503e82 100644
--- a/fixtures/scenario001.pp
+++ b/fixtures/scenario001.pp
@@ -24,7 +24,8 @@ case $::osfamily {
   'RedHat': {
     $ipv6            = true
     $enable_panko    = true
-    $enable_vitrage  = true
+    # TODO(EmilienM) enable vitrage again when it's stable
+    $enable_vitrage  = false
   }
   default: {
     fail("Unsupported osfamily (${::osfamily})")
diff --git a/manifests/designate.pp b/manifests/designate.pp
index 849c21536..4a1ed115d 100644
--- a/manifests/designate.pp
+++ b/manifests/designate.pp
@@ -21,6 +21,8 @@ class openstack_integration::designate {
     require              => Class['::rabbitmq'],
   }
 
+  Rabbitmq_user_permissions['designate@/'] -> Service<| tag == 'designate-service' |>
+
   class { '::designate::db::mysql':
     password => 'designate',
   }
diff --git a/run_tests.sh b/run_tests.sh
index 5fc77c090..ea1f8f8c1 100755
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -275,7 +275,7 @@ if uses_debs; then
   # TODO(aschultz): check this after ocata-m3 is published for UCA
   # 1) this will disable the lbaas listeners tests for ubuntu only due to flakey
   # failures
-  EXCLUDES="--regex=^(?!neutron_lbaas.tests.tempest.v2.api.test_listeners_.*admin.ListenersTestJSON.*$)(?!ceilometer.tests.tempest.api.test_telemetry_notification_api.TelemetryNotificationAPITest.test_check_glance_v2_notifications.*$).*"
+  EXCLUDES="--regex=^(?!neutron_lbaas.tests.tempest.v2.api.test_listeners_.*admin.ListenersTestJSON.*$)(?!neutron_fwaas.tests.tempest_plugin.tests.api.test_fwaas_extensions.*$)(?!ceilometer.tests.tempest.api.test_telemetry_notification_api.TelemetryNotificationAPITest.test_check_glance_v2_notifications.*$).*"
 else
   EXCLUDES="--regex=^(?!mistral_tempest_tests.tests.api.v2.test_executions.ExecutionTestsV2.test_get_list_executions.*$)(?!ceilometer.tests.tempest.api.test_telemetry_notification_api.TelemetryNotificationAPITest.test_check_glance_v2_notifications.*$).*"
 fi