Merge "Adding ceph as backup backed for cinder"
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}
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}