Merge "Contrail-schema config updated" into stable/2.1

This commit is contained in:
Jenkins 2015-11-24 11:13:46 +00:00 committed by Gerrit Code Review
commit 3545659e03
1 changed files with 4 additions and 5 deletions

View File

@ -11,11 +11,6 @@ case node['role']
end
end
-%>
rabbit_server=<%= scope.lookupvar('contrail::mos_mgmt_vip') %>
rabbit_port=5673
rabbit_user = nova
rabbit_password = <%= scope.lookupvar('contrail::rabbit_password') %>
[DEFAULTS]
ifmap_server_ip=<%= scope.lookupvar('contrail::address') %>
ifmap_server_port=8443
@ -30,6 +25,10 @@ disc_server_ip=<%= scope.lookupvar('contrail::contrail_private_vip') %>
disc_server_port=5998
log_local=1
log_level=SYS_NOTICE
rabbit_server=<%= scope.lookupvar('contrail::mos_mgmt_vip') %>
rabbit_port=5673
rabbit_user = nova
rabbit_password = <%= scope.lookupvar('contrail::rabbit_password') %>
[SECURITY]
use_certs=False