From 75ee8d43275ac36904328fc221af2f8fd66beb21 Mon Sep 17 00:00:00 2001 From: Muhammad Shahzeb Date: Wed, 8 Jun 2016 01:27:37 -0700 Subject: [PATCH] Adding ecmp support for neutron. - Create pgrc file in /etc/neutron/plugins/plumgrid - Using identity v2.0 for MOS7 Change-Id: Ic2ee45682a1eab548491e837fd212aa7c587240d Ticket: [SOL-807] Signed-off-by: Muhammad Shahzeb --- deployment_scripts/puppet/manifests/director.pp | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/deployment_scripts/puppet/manifests/director.pp b/deployment_scripts/puppet/manifests/director.pp index 1a8e7f2..a51963c 100644 --- a/deployment_scripts/puppet/manifests/director.pp +++ b/deployment_scripts/puppet/manifests/director.pp @@ -54,6 +54,8 @@ $neutron_db_uri = "mysql://${neutron_db_user}:${neutron_db_password}@${neutron_d # OpenStack Access settings $access_hash = hiera_hash('access', {}) +$admin_username = pick($access_hash['user']) +$admin_tenant = pick($access_hash['tenant']) $admin_password = pick($access_hash['password']) # Add fuel node fqdn to /etc/hosts @@ -169,3 +171,11 @@ file { 'plumgrid_plugin.py': source => 'puppet:///modules/plumgrid/plumgrid_plugin.py', notify => Service["$::neutron::params::server_service"] } + +# Update PLUMgrid pgrc file + +file { 'pgrc': + ensure => present, + path => '/etc/neutron/plugins/plumgrid/pgrc', + content => "export os_auth_url=http://$service_endpoint:35357/v2.0\nexport os_admin_user=$admin_username\nexport os_admin_tenant=$admin_tenant\nexport os_admin_password=$admin_password\nexport pg_virtual_ip=$plumgrid_vip\nexport pg_username=$plumgrid_username\nexport pg_password=$plumgrid_password", +}