Merge "CI: Fix nfv job with kolla dependency"

tests/setup_gate.sh

@@ -66,7 +66,7 @@ function prepare_images {
     fi
 
     if [[ $SCENARIO == "scenario_nfv" ]]; then
-        GATE_IMAGES+=",^tacker,^mistral,^redis,^barbican"
+        GATE_IMAGES+=",^aodh,^tacker,^mistral,^redis,^barbican"
     fi
     if [[ $SCENARIO == "ironic" ]]; then
         GATE_IMAGES+=",^dnsmasq,^ironic,^iscsid"

zuul.d/base.yaml

@@ -182,7 +182,7 @@
     parent: kolla-ansible-base
     voting: false
     files:
-      - ^ansible/roles/(barbican|heat|mistral|redis|tacker)/
+      - ^ansible/roles/(aodh|barbican|heat|mistral|redis|tacker)/
       - ^tests/test-scenario-nfv.sh
       - ^tests/test-dashboard.sh
     vars: