summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-02-04 03:50:43 +0000
committerGerrit Code Review <review@openstack.org>2016-02-04 03:50:44 +0000
commit6a4926b86327e9c67b78633ef2eb5ac846b73c0d (patch)
treee7efdbc62ac2927b78d20827b8f5ed69bd705240 /tools
parent75ccdb25999f30ecfb3ec406b8baa4d20ec2f98a (diff)
parent9d52fb6352ede75ed4b2e4691bd5fd1a39b6f09e (diff)
downloadkeystone-6a4926b86327e9c67b78633ef2eb5ac846b73c0d.tar.gz
Merge "Do not assign admin to service users"
Diffstat (limited to 'tools')
-rwxr-xr-xtools/sample_data.sh30
1 files changed, 18 insertions, 12 deletions
diff --git a/tools/sample_data.sh b/tools/sample_data.sh
index bf96023f5..ce4074312 100755
--- a/tools/sample_data.sh
+++ b/tools/sample_data.sh
@@ -32,11 +32,11 @@
# Tenant User Roles
# -------------------------------------------------------
# demo admin admin
-# service glance admin
-# service nova admin
-# service ec2 admin
-# service swift admin
-# service neutron admin
+# service glance service
+# service nova service
+# service ec2 service
+# service swift service
+# service neutron service
# By default, passwords used are those in the OpenStack Install and Deploy Manual.
# One can override these (publicly known, and hence, insecure) passwords by setting the appropriate
@@ -101,6 +101,14 @@ function get_id () {
}
#
+# Roles
+#
+
+openstack role create admin
+
+openstack role create service
+
+#
# Default tenant
#
openstack project create demo \
@@ -109,8 +117,6 @@ openstack project create demo \
openstack user create admin --project demo \
--password "${ADMIN_PASSWORD}"
-openstack role create admin
-
openstack role add --user admin \
--project demo\
admin
@@ -126,35 +132,35 @@ openstack user create glance --project service\
openstack role add --user glance \
--project service \
- admin
+ service
openstack user create nova --project service\
--password "${NOVA_PASSWORD}"
openstack role add --user nova \
--project service \
- admin
+ service
openstack user create ec2 --project service \
--password "${EC2_PASSWORD}"
openstack role add --user ec2 \
--project service \
- admin
+ service
openstack user create swift --project service \
--password "${SWIFT_PASSWORD}" \
openstack role add --user swift \
--project service \
- admin
+ service
openstack user create neutron --project service \
--password "${NEUTRON_PASSWORD}" \
openstack role add --user neutron \
--project service \
- admin
+ service
#
# Keystone service