@@ -73,14 +73,7 @@ keystone user-role-add --user $DEMO_USER --role $MEMBER_ROLE --tenant_id $DEMO_T
7373keystone user-role-add --user $DEMO_USER --role $MEMBER_ROLE --tenant_id $INVIS_TENANT
7474
7575
76- # Services
77- keystone service-create --name=keystone \
78- --type=identity \
79- --description=" Keystone Identity Service"
80-
81- keystone service-create --name=nova \
82- --type=compute \
83- --description=" Nova Compute Service"
76+ # Configure service users/roles
8477NOVA_USER=$( get_id keystone user-create --name=nova \
8578 --pass=" $SERVICE_PASSWORD " \
8679 --tenant_id $SERVICE_TENANT \
@@ -89,13 +82,6 @@ keystone user-role-add --tenant_id $SERVICE_TENANT \
8982 --user $NOVA_USER \
9083 --role $ADMIN_ROLE
9184
92- keystone service-create --name=ec2 \
93- --type=ec2 \
94- --description=" EC2 Compatibility Layer"
95-
96- keystone service-create --name=glance \
97- --type=image \
98- --description=" Glance Image Service"
9985GLANCE_USER=$( get_id keystone user-create --name=glance \
10086 --pass=" $SERVICE_PASSWORD " \
10187 --tenant_id $SERVICE_TENANT \
@@ -104,16 +90,7 @@ keystone user-role-add --tenant_id $SERVICE_TENANT \
10490 --user $GLANCE_USER \
10591 --role $ADMIN_ROLE
10692
107- if [[ " $ENABLED_SERVICES " =~ " n-vol" ]]; then
108- keystone service-create --name=" nova-volume" \
109- --type=volume \
110- --description=" Nova Volume Service"
111- fi
112-
11393if [[ " $ENABLED_SERVICES " =~ " swift" ]]; then
114- keystone service-create --name=swift \
115- --type=" object-store" \
116- --description=" Swift Service"
11794 SWIFT_USER=$( get_id keystone user-create --name=swift \
11895 --pass=" $SERVICE_PASSWORD " \
11996 --tenant_id $SERVICE_TENANT \
@@ -124,9 +101,6 @@ if [[ "$ENABLED_SERVICES" =~ "swift" ]]; then
124101fi
125102
126103if [[ " $ENABLED_SERVICES " =~ " quantum" ]]; then
127- keystone service-create --name=quantum \
128- --type=network \
129- --description=" Quantum Service"
130104 QUANTUM_USER=$( get_id keystone user-create --name=quantum \
131105 --pass=" $SERVICE_PASSWORD " \
132106 --tenant_id $SERVICE_TENANT \
0 commit comments