commit fb965ac55aefa0ee33582eae7dd06aa606fd9293
author mcp-jenkins <mcp-jenkins@mirantis.com> Thu Nov 29 12:28:30 2018 +0000
committer Gerrit Code Review <mail@domain.com> Thu Nov 29 12:28:30 2018 +0000
tree 7fb7a79a3d927991a578456c04d14f678d995a53
parent ef6cf82e3820ba2e1e47de813b6d5b1c0d309d53
parent 66a066e7f5a1ef78744092de913644aa18e916f0

Merge "ContrailPlugin: remove admin_token"

neutron/files/ocata/ContrailPlugin.ini

diff --git a/neutron/files/ocata/ContrailPlugin.ini b/neutron/files/ocata/ContrailPlugin.ini
index 2817f52..c66a4e3 100644
--- a/neutron/files/ocata/ContrailPlugin.ini
+++ b/neutron/files/ocata/ContrailPlugin.ini
@@ -7,7 +7,6 @@
 
 [KEYSTONE]
 auth_url = http://{{ server.identity.host }}:35357/v2.0
-admin_token = {{ server.backend.token }}
 admin_user={{ server.backend.user }}
 admin_password={{ server.backend.password }}
 admin_tenant_name={{ server.backend.tenant }}
\ No newline at end of file

neutron/files/pike/ContrailPlugin.ini

diff --git a/neutron/files/pike/ContrailPlugin.ini b/neutron/files/pike/ContrailPlugin.ini
index 2817f52..c66a4e3 100644
--- a/neutron/files/pike/ContrailPlugin.ini
+++ b/neutron/files/pike/ContrailPlugin.ini
@@ -7,7 +7,6 @@
 
 [KEYSTONE]
 auth_url = http://{{ server.identity.host }}:35357/v2.0
-admin_token = {{ server.backend.token }}
 admin_user={{ server.backend.user }}
 admin_password={{ server.backend.password }}
 admin_tenant_name={{ server.backend.tenant }}
\ No newline at end of file

neutron/files/queens/ContrailPlugin.ini

diff --git a/neutron/files/queens/ContrailPlugin.ini b/neutron/files/queens/ContrailPlugin.ini
index e00d234..d8739d1 100644
--- a/neutron/files/queens/ContrailPlugin.ini
+++ b/neutron/files/queens/ContrailPlugin.ini
@@ -7,7 +7,6 @@
 
 [KEYSTONE]
 auth_url = http://{{ server.identity.host }}:5000
-admin_token = {{ server.backend.token }}
 admin_user={{ server.backend.user }}
 admin_password={{ server.backend.password }}
 admin_tenant_name={{ server.backend.tenant }}
\ No newline at end of file