commit d0d8fdc2e6f173fde7b2d6c2d90b055efb4a6855
author Aleksey Zvyagintsev <azvyagintsev@mirantis.com> Thu Feb 21 10:25:57 2019 +0000
committer Gerrit Code Review <mail@domain.com> Thu Feb 21 10:25:57 2019 +0000
tree 550186c9d0580b62172dff34705346ace6b4fce5
parent fa885ed809c59ba71e87b1242eda78984acd55ed
parent 451aed21cabbd959db74906a145362a08b97ecac

Merge "Refactor generateModel"

src/com/mirantis/mcp/Validate.groovy

diff --git a/src/com/mirantis/mcp/Validate.groovy b/src/com/mirantis/mcp/Validate.groovy
index 588b7ae..de71cff 100644
--- a/src/com/mirantis/mcp/Validate.groovy
+++ b/src/com/mirantis/mcp/Validate.groovy
@@ -56,8 +56,8 @@
         entry_point = '--entrypoint /bin/bash'
     }
     salt.cmdRun(master, target, "docker run -tid --net=host --name=${name} " +
-                                "-v /etc/ssl/certs/:/etc/ssl/certs/ " +
-                                "-u root ${entry_point} ${variables} ${dockerImageLink}")
+                                "-u root ${entry_point} ${variables} " +
+                                "-v /srv/salt/pki/${cluster_name}/:/etc/certs ${dockerImageLink}")
 }
 
 
@@ -99,10 +99,11 @@
         keystone.add("OS_AUTH_URL=${_pillar.auth.auth_url}/v3")
         keystone.add("OS_REGION_NAME=${_pillar.region_name}")
         keystone.add("OS_IDENTITY_API_VERSION=${_pillar.identity_api_version}")
-        keystone.add("OS_ENDPOINT_TYPE=admin")
+        keystone.add("OS_ENDPOINT_TYPE=internal")
         keystone.add("OS_PROJECT_DOMAIN_NAME=${_pillar.auth.project_domain_name}")
         keystone.add("OS_USER_DOMAIN_NAME=${_pillar.auth.user_domain_name}")
-        keystone.add("OS_CACERT=/etc/ssl/certs/ca-certificates.crt")
+        // we mount /srv/salt/pki/${cluster_name}/:/etc/certs with certs for cvp container
+        keystone.add("OS_CACERT='/etc/certs/proxy-with-chain.crt'")
         return keystone
     }
     else {