x/fuel-plugin-contrail
Code Issues Proposed changes

Merge "Testbed file definitions updated"

Browse Source
This commit is contained in:
Jenkins
2015-06-26 16:39:10 +00:00
committed by Gerrit Code Review
parent dc5c1bd850 a83f1d7524
commit a032b9d3ab
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
deployment_scripts/puppet/modules/contrail/manifests/init.pp
View File

@@ -35,6 +35,10 @@ $service_token = $neutron_settings['keystone']['admin_password']
$keystone=hiera('keystone')
$admin_token = $keystone['admin_token']
$admin_settings = hiera('access')
$admin_username = $admin_settings['user']
$admin_password = $admin_settings['password']
$mos_mgmt_vip=hiera('management_vip')
# Contrail settings

2
deployment_scripts/puppet/modules/contrail/templates/testbed.py.erb
View File

@@ -94,7 +94,7 @@ env.roledefs = {
}
#Openstack admin password
env.openstack_admin_password = 'admin'
env.openstack_admin_password = '<%= scope.lookupvar('contrail::admin_password') %>'
env.password = 'r00tme'
#Passwords of each host
env.passwords = {