Merge "Add Patrole gate job for stable/train"
diff --git a/.zuul.yaml b/.zuul.yaml
index fc43d97..1861cf3 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -94,6 +94,14 @@
         RBAC_TEST_ROLES: reader
 
 - job:
+    name: patrole-member-train
+    parent: patrole-member
+    override-checkout: stable/train
+    vars:
+      devstack_localrc:
+        USE_PYTHON3: True
+
+- job:
     name: patrole-member-stein
     parent: patrole-member
     override-checkout: stable/stein
@@ -192,6 +200,7 @@
         - patrole-admin
         - patrole-member
         - patrole-reader
+        - patrole-member-train
         - patrole-member-stein
         - patrole-multinode-admin
         - patrole-multinode-member
@@ -203,4 +212,5 @@
         - patrole-member
     periodic-stable:
       jobs:
+        - patrole-member-train
         - patrole-member-stein
diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index af71066..9daf285 100644
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -105,6 +105,11 @@
        iniset $TEMPEST_CONFIG policy-feature-enabled changed_nova_policies_ussuri False
     fi
 
+    if [[ ${DEVSTACK_SERIES} == 'train' ]]; then
+       # Remove this once stable/train becomes EOL.
+       iniset $TEMPEST_CONFIG policy-feature-enabled changed_nova_policies_ussuri False
+    fi
+
     iniset $TEMPEST_CONFIG patrole rbac_test_roles $RBAC_TEST_ROLES
 }