Description of problem:
Because keystone command parameter was changed,
the sample_data.sh does not work.


How reproducible:


Steps to Reproduce:
1.yum --enablerepo=epel-testing update, 
ensure the openstack-keystoneclient rpm version is 1:0.1.3.9-1.el6

2.setup envrionments for openstack instance.

3.run
run 
ADMIN_PASSWORD=$OS_PASSWORD SERVICE_PASSWORD=servicepass \
  openstack-keystone-sample-data


  
Actual results:


Expected results:


Additional info:
in the lastest rpm, `keystone user-role-add` does not
accept ROLE_ID parameter, dislike the older generation.

Version-Release number of selected component (if applicable):
1:0.1.3.9-1.el6