x/group-based-policy
Code Issues Proposed changes

NFP - Fixed authtoken configuration

Browse Source 
Adding missing options to nfp keystone authtoken section

Change-Id: I0c54f6565256ea59b5e318def730f4f0a2f49e56
Closes-Bug: 1654937
This commit is contained in:
Rajendra Machani
2017-01-09 12:42:21 +05:30
committed by Subrahmanyam Ongole
parent b52ae6258d
commit dc28cb1e04
4 changed files with 34 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
devstack/lib/nfp
View File

@@ -454,11 +454,19 @@ function copy_nfp_files_and_start_process {
admin_password=`iniget $NEUTRON_CONF keystone_authtoken admin_password`
admin_tenant_name=`iniget $NEUTRON_CONF keystone_authtoken admin_tenant_name`
auth_uri=`iniget $NEUTRON_CONF keystone_authtoken auth_uri`
auth_protocol=$(echo $auth_uri | tr ':/' ' ' | awk '{print $1}')
auth_host=$(echo $auth_uri | tr ':/' ' ' | awk '{print $2}')
auth_port=$(echo $auth_uri | tr ':/' ' ' | awk '{print $3}')
auth_version=$(echo $auth_uri | tr ':/' ' ' | awk '{print $4}')
auth_version=${auth_version:-v2.0}
iniset -sudo /etc/nfp.ini nfp_keystone_authtoken admin_user $admin_user
iniset -sudo /etc/nfp.ini nfp_keystone_authtoken admin_password $admin_password
iniset -sudo /etc/nfp.ini nfp_keystone_authtoken admin_tenant_name $admin_tenant_name
iniset -sudo /etc/nfp.ini nfp_keystone_authtoken auth_uri $auth_uri
iniset -sudo /etc/nfp.ini nfp_keystone_authtoken auth_protocol $auth_protocol
iniset -sudo /etc/nfp.ini nfp_keystone_authtoken auth_host $auth_host
iniset -sudo /etc/nfp.ini nfp_keystone_authtoken auth_port $auth_port
iniset -sudo /etc/nfp.ini nfp_keystone_authtoken auth_version $auth_version
sed -i 's#source.*#source '$DEVSTACK_DIR'/openrc demo demo#g' $NFPSERVICE_DIR/devstack/exercises/nfp_service/*.sh
source $DEVSTACK_DIR/functions-common

11
gbpservice/contrib/nfp/tools/setup_nfp.py
View File

@@ -82,10 +82,19 @@ def set_keystone_authtoken_section():
admin_password = commands.getoutput("crudini --get " + NEUTRON_CONF + " keystone_authtoken admin_password")
admin_tenant_name = commands.getoutput("crudini --get " + NEUTRON_CONF + " keystone_authtoken admin_tenant_name")
auth_uri = commands.getoutput("crudini --get " + NEUTRON_CONF + " keystone_authtoken auth_uri")
auth_protocol = commands.getoutput("echo " + auth_uri + " | cut -d':' -f1")
auth_host = commands.getoutput("echo " + auth_uri + " | cut -d'/' -f3 | cut -d':' -f1")
auth_port = commands.getoutput("echo " + auth_uri + " | cut -d'/' -f3 | cut -d':' -f2")
auth_version = commands.getoutput("echo " + auth_uri + " | cut -d'/' -f4")
if auth_version == '':
auth_version = 'v2.0'
subprocess.call(("crudini --set " + nfp_conf + " nfp_keystone_authtoken admin_user " + admin_user).split(' '))
subprocess.call(("crudini --set " + nfp_conf + " nfp_keystone_authtoken admin_password " + admin_password).split(' '))
subprocess.call(("crudini --set " + nfp_conf + " nfp_keystone_authtoken admin_tenant_name " + admin_tenant_name).split(' '))
subprocess.call(("crudini --set " + nfp_conf + " nfp_keystone_authtoken auth_uri " + auth_uri).split(' '))
subprocess.call(("crudini --set " + nfp_conf + " nfp_keystone_authtoken auth_protocol " + auth_protocol).split(' '))
subprocess.call(("crudini --set " + nfp_conf + " nfp_keystone_authtoken auth_host " + auth_host).split(' '))
subprocess.call(("crudini --set " + nfp_conf + " nfp_keystone_authtoken auth_port " + auth_port).split(' '))
subprocess.call(("crudini --set " + nfp_conf + " nfp_keystone_authtoken auth_version " + auth_version).split(' '))
def configure_nfp():
commands.getoutput("cat /usr/lib/python2.7/site-packages/gbpservice/contrib/nfp/bin/nfp.ini >> /etc/nfp.ini")

7
gbpservice/nfp/bin/nfp.ini
View File

@@ -50,10 +50,13 @@ nfp_controller_port=8070
topic=nfp-proxy-agent-topic
[nfp_keystone_authtoken]
admin_password=
admin_user=
admin_password=
admin_tenant_name=
auth_uri=
auth_protocol=
auth_host=
auth_port=
auth_version=
[heat_driver]
# External network on which vpn sites/users connect,

12
gbpservice/tests/contrib/devstack/nfp
View File

@@ -156,7 +156,7 @@ function create_nfp_gbp_resources {
function delete_nfp_gbp_resources {
TOP_DIR=$1
source $TOP_DIR/openrc neutron service
neutron port-delete nfp-proxy_port
gbp ptg-show svc_management_ptg -f value -c policy_targets
@@ -203,11 +203,19 @@ function copy_nfp_files_and_start_process {
admin_password=`iniget /etc/neutron/neutron.conf keystone_authtoken admin_password`
admin_tenant_name=`iniget /etc/neutron/neutron.conf keystone_authtoken admin_tenant_name`
auth_uri=`iniget /etc/neutron/neutron.conf keystone_authtoken auth_uri`
auth_protocol=$(echo $auth_uri | tr ':/' ' ' | awk '{print $1}')
auth_host=$(echo $auth_uri | tr ':/' ' ' | awk '{print $2}')
auth_port=$(echo $auth_uri | tr ':/' ' ' | awk '{print $3}')
auth_version=$(echo $auth_uri | tr ':/' ' ' | awk '{print $4}')
auth_version=${auth_version:-v2.0}
iniset -sudo /etc/nfp.ini nfp_keystone_authtoken admin_user $admin_user
iniset -sudo /etc/nfp.ini nfp_keystone_authtoken admin_password $admin_password
iniset -sudo /etc/nfp.ini nfp_keystone_authtoken admin_tenant_name $admin_tenant_name
iniset -sudo /etc/nfp.ini nfp_keystone_authtoken auth_uri $auth_uri
iniset -sudo /etc/nfp.ini nfp_keystone_authtoken auth_protocol $auth_protocol
iniset -sudo /etc/nfp.ini nfp_keystone_authtoken auth_host $auth_host
iniset -sudo /etc/nfp.ini nfp_keystone_authtoken auth_port $auth_port
iniset -sudo /etc/nfp.ini nfp_keystone_authtoken auth_version $auth_version
ipnetns_router=`sudo ip netns |grep $RouterId`