Changed --user to --user_id and --role to --role_id in the keystone client for consistency. Need to update keystone calls here.
Changed --user to --user_id and --role to --role_id in the keystone client for consistency. Need to update keystone calls here.

This change should be applied after [bug/994744 b7fe11c] in python-keystoneclient.

Fixes bug 994744.

Change-Id: I13e643f8552d86ed0bf92799271899f777bde9b2

varunarya10/devstack,bq-xiao/devstack,samgoon/devstack,ewindisch/raspi-devstack,pombredanne/devstack,cloudbuilders/devstack,CloudServer/devstack,herrsechs/devstack,bswartz/devstack,shootstar/devstacktest,dirkmueller/devstack,vishnugonela/devstack,wenhuizhang/devstack,olivierlemasle/devstack,openstack-dev/devstack,liuquansheng47/devstack,ozamiatin/devstack,nuxeh/devstack,costingalan/devstack,richliu/devstack,vsham20/devstack,vishnugonela/devstack,avvocatodemarchis/devstack,bq-xiao/devstack,inkerra/devstack,richliu/devstack,bigswitch/devstack,nawawi/openstack,eshnil2000/devstack,citrix-openstack-build/devstack,innodee/openstackk,nati/devstack_public,CloudServer/devstack,mmasaki/devstack,atulpatil301/devstack,liuquansheng47/devstack,affo/devstack,pacinete/devstack,savi-dev/devstack,atulpatil301/devstack,sequenceiq/devstack,ykaneko/devstack,mssumanth/devstack,BSJAIN92/OpenStack,ykaneko/devstack,LoHChina/devstack,pczerkas/devstack,neerja28/Devstack_GlusterFS,upadhyay-prashant/devstack,bljgaurav/openstack-test,noironetworks/devstack,Juniper/devstack,ewindisch/raspi-devstack,nttmcl/devstack_public,nttmcl/devstack_public,pczerkas/devstack,HPCHub/devstack,CiscoSystems/devstack,TwinkleChawla/devstack,sc68cal/devstack,prithivm/branch01,wenhuizhang/devstack,flavio-fernandes/devstack,noironetworks/devstack,BSJAIN92/OpenStack,group-policy/devstack,nuxeh/devstack,affo/devstack,neerja28/Devstack_GlusterFS,r-mibu/devstack,parul24/devstack,ozamiatin/devstack,Mahito/devstack,dtroyer/devstack,savi-dev/devstack,kplus/devstack-moonshot,NaokiMiyata/devstack,mc2014/devstack,promptworks/devstack,armando-migliaccio/devstack,sc68cal/devstack,kplus/devstack-moonshot,tianweizhang/devstack,herrsechs/devstack,r-mibu/devstack,promptworks/devstack,eharney/devstack,sstrato/devstack,virtualopensystems/devstack,bljgaurav/openstack-test,andrewrothstein/devstack,avvocatodemarchis/devstack,eharney/devstack,Mahito/devstack,dirkmueller/devstack,bigswitch/devstack,Millnert/contrail-devstack,cloudbuilders/devstack,tianweizhang/devstack,pombredanne/devstack,dtroyer/devstack,flavio-fernandes/devstack,prithivm/branch01,rushiagr/devstack,upadhyay-prashant/devstack,HPCHub/devstack,NaokiMiyata/devstack,varunarya10/devstack,thomasem/devstack,deepakselvaraj/devstack,pacinete/devstack,j4/devstack,andrewrothstein/devstack,group-policy/devstack,mc2014/devstack,mmasaki/devstack,TwinkleChawla/devstack,rushiagr/devstack,openstack-dev/devstack,srics/devstack,parul24/devstack,nati/devstack_public,sequenceiq/devstack,williamthegrey/devstack,Yuriy-Leonov/devstack,jamielennox/devstack,j4/devstack,nawawi/openstack,citrix-openstack-build/devstack,thomasem/devstack,bswartz/devstack,mssumanth/devstack,LoHChina/devstack,olivierlemasle/devstack,vsham20/devstack,JioCloud/devstack,yamt/devstack,costingalan/devstack,samgoon/devstack