Revert "Update Openstack lib to support v3 keystone config"
This reverts commit fb267456c31f9cd29311a75bcd37a0545bc3d446.
Change-Id: I09845d32a664b729579581c09bb3b36646a2e0ad
diff --git a/src/com/mirantis/mk/Openstack.groovy b/src/com/mirantis/mk/Openstack.groovy
index 95ebc93..f8a3c33 100644
--- a/src/com/mirantis/mk/Openstack.groovy
+++ b/src/com/mirantis/mk/Openstack.groovy
@@ -33,7 +33,6 @@
'python-neutronclient>=2.2.6,<2.3.0',
'python-novaclient>=2.19.0,<2.20.0',
'python-swiftclient>=2.5.0,<2.6.0',
- 'python-openstackclient>=1.7.0,<1.8.0',
'oslo.config>=2.2.0,<2.3.0',
'oslo.i18n>=2.3.0,<2.4.0',
'oslo.serialization>=1.8.0,<1.9.0',
@@ -66,7 +65,7 @@
* @param project OpenStack project to connect to
*/
def createOpenstackEnv(url, credentialsId, project, project_domain="default",
- project_id="", user_domain="default", api_ver="2") {
+ user_domain= "default") {
def common = new com.mirantis.mk.Common()
rcFile = "${env.WORKSPACE}/keystonerc"
creds = common.getPasswordCredentials(credentialsId)
@@ -77,10 +76,8 @@
export OS_AUTH_URL=${url}
export OS_AUTH_STRATEGY=keystone
export OS_PROJECT_NAME=${project}
-export OS_PROJECT_ID=${project_id}
export OS_PROJECT_DOMAIN_ID=${project_domain}
-export OS_USER_DOMAIN_NAME=${user_domain}
-export OS_API_IDENTITY_VERSION=${api_ver}
+export OS_USER_DOMAIN_ID=${user_domain}
set -x
"""
writeFile file: rcFile, text: rc
@@ -118,7 +115,7 @@
*/
def getKeystoneToken(client, path = null) {
def python = new com.mirantis.mk.Python()
- cmd = "openstack token issue"
+ cmd = "keystone token-get"
outputTable = runOpenstackCommand(cmd, client, path)
output = python.parseTextTable(outputTable, 'item', 'prettytable', path)
return output