commit e58989b67b00dbbba48dcbff0fb91e95d7138447
author mcp-jenkins <mcp-jenkins@mirantis.com> Thu Jan 23 09:34:49 2020 +0000
committer Gerrit Code Review <mail@domain.com> Thu Jan 23 09:34:49 2020 +0000
tree c0e7a64015ff8c331d23010679bad5311a3097a6
parent 319ed02d2c1ef5a238b5f3b0699423aac45d7f89
parent 9c7c1a3a90a337970dc81f4f298ab2ce4d819f81

Merge "Update the keystone.server for opencontrail checks" into release/proposed/2019.2.0

opencontrail40-upgrade.groovy

diff --git a/opencontrail40-upgrade.groovy b/opencontrail40-upgrade.groovy
index 2f89659..c80b53b 100644
--- a/opencontrail40-upgrade.groovy
+++ b/opencontrail40-upgrade.groovy
@@ -128,7 +128,7 @@
                 }
 
                 // Make sure that dedicated opencontrail user is created
-                salt.enforceState(pepperEnv, 'I@keystone:server:role:primary', 'keystone.client.server')
+                salt.enforceState(pepperEnv, 'I@keystone:server:role:primary', 'keystone.client.resources.v3')
 
                 try {
                     controllerImage = getValueForPillarKey(pepperEnv, "I@opencontrail:control:role:primary", "docker:client:compose:opencontrail:service:controller:image")