commit e5ee51306c80285edfd3a00c9e2ae56961259ae2
author mcp-jenkins <mcp-jenkins@mirantis.com> Wed Jan 02 21:01:43 2019 +0000
committer Gerrit Code Review <mail@domain.com> Wed Jan 02 21:01:43 2019 +0000
tree 50315800417740c17279f8d2a1e9f20bdf909748
parent acaecb73ccc4b62e4e04fd3b4aacaf41f13e0307
parent 69b5e415b214a4b4fa83e75022c6fe2035c1539c

Merge "Adding ceph as backup backed for cinder"

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}