commit 5eed01f989f165de7a5871f9ac82acb828789251
author Inessa Vasilevskaya <ivasilevskaya@mirantis.com> Fri Dec 28 16:36:52 2018 +0100
committer Tatyana Leontovich <tleontovich@mirantis.com> Mon Jan 21 14:20:18 2019 +0000
tree 05377a1fbb9c4f5d87226c04263d138dbb2c30d5
parent dca068da8d98d1b15433e80cdf004a84436cd9d0

use contrail admin for neutron+OC

Use a dedicated contrail user/password in
admin tenant for contrail.

Depends-On: https://gerrit.mcp.mirantis.com/#/c/33257

PROD-23357

Change-Id: I4090cfaa6c8c5398ec9ad2ea17307b5e95723595
(cherry picked from commit acaecb73ccc4b62e4e04fd3b4aacaf41f13e0307)

neutron/control/opencontrail/cluster.yml

diff --git a/neutron/control/opencontrail/cluster.yml b/neutron/control/opencontrail/cluster.yml
index 4bc0e71..a33c273 100644
--- a/neutron/control/opencontrail/cluster.yml
+++ b/neutron/control/opencontrail/cluster.yml
@@ -16,7 +16,7 @@
         engine: contrail
         host: ${_param:opencontrail_control_address}
         port: 8082
-        user: admin
-        password: ${_param:keystone_admin_password}
+        user: ${_param:opencontrail_admin_user}
+        password: ${_param:opencontrail_admin_password}
         tenant: admin
         token: ${_param:keystone_service_token}

neutron/control/opencontrail/single.yml

diff --git a/neutron/control/opencontrail/single.yml b/neutron/control/opencontrail/single.yml
index e47aa2c..00fa23c 100644
--- a/neutron/control/opencontrail/single.yml
+++ b/neutron/control/opencontrail/single.yml
@@ -19,7 +19,7 @@
         engine: contrail
         host: ${_param:opencontrail_control_address}
         port: 8082
-        user: admin
-        password: ${_param:keystone_admin_password}
+        user: ${_param:opencontrail_admin_user}
+        password: ${_param:opencontrail_admin_password}
         tenant: admin
         token: ${_param:keystone_service_token}