... | ... |
@@ -79,19 +79,19 @@ function is_ceilometer_enabled { |
79 | 79 |
|
80 | 80 |
create_ceilometer_accounts() { |
81 | 81 |
|
82 |
- SERVICE_TENANT=$(openstack project list | awk "/ $SERVICE_TENANT_NAME / { print \$2 }") |
|
83 |
- ADMIN_ROLE=$(openstack role list | awk "/ admin / { print \$2 }") |
|
82 |
+ local service_tenant=$(openstack project list | awk "/ $SERVICE_TENANT_NAME / { print \$2 }") |
|
83 |
+ local admin_role=$(openstack role list | awk "/ admin / { print \$2 }") |
|
84 | 84 |
|
85 | 85 |
# Ceilometer |
86 | 86 |
if [[ "$ENABLED_SERVICES" =~ "ceilometer-api" ]]; then |
87 |
- CEILOMETER_USER=$(get_or_create_user "ceilometer" \ |
|
88 |
- "$SERVICE_PASSWORD" $SERVICE_TENANT) |
|
89 |
- get_or_add_user_role $ADMIN_ROLE $CEILOMETER_USER $SERVICE_TENANT |
|
87 |
+ local ceilometer_user=$(get_or_create_user "ceilometer" \ |
|
88 |
+ "$SERVICE_PASSWORD" $service_tenant) |
|
89 |
+ get_or_add_user_role $admin_role $ceilometer_user $service_tenant |
|
90 | 90 |
|
91 | 91 |
if [[ "$KEYSTONE_CATALOG_BACKEND" = 'sql' ]]; then |
92 |
- CEILOMETER_SERVICE=$(get_or_create_service "ceilometer" \ |
|
92 |
+ local ceilometer_service=$(get_or_create_service "ceilometer" \ |
|
93 | 93 |
"metering" "OpenStack Telemetry Service") |
94 |
- get_or_create_endpoint $CEILOMETER_SERVICE \ |
|
94 |
+ get_or_create_endpoint $ceilometer_service \ |
|
95 | 95 |
"$REGION_NAME" \ |
96 | 96 |
"$CEILOMETER_SERVICE_PROTOCOL://$CEILOMETER_SERVICE_HOST:$CEILOMETER_SERVICE_PORT/" \ |
97 | 97 |
"$CEILOMETER_SERVICE_PROTOCOL://$CEILOMETER_SERVICE_HOST:$CEILOMETER_SERVICE_PORT/" \ |
... | ... |
@@ -169,23 +169,23 @@ function configure_glance { |
169 | 169 |
function create_glance_accounts { |
170 | 170 |
if is_service_enabled g-api; then |
171 | 171 |
|
172 |
- GLANCE_USER=$(get_or_create_user "glance" \ |
|
172 |
+ local glance_user=$(get_or_create_user "glance" \ |
|
173 | 173 |
"$SERVICE_PASSWORD" $SERVICE_TENANT_NAME) |
174 |
- get_or_add_user_role service $GLANCE_USER $SERVICE_TENANT_NAME |
|
174 |
+ get_or_add_user_role service $glance_user $SERVICE_TENANT_NAME |
|
175 | 175 |
|
176 | 176 |
# required for swift access |
177 | 177 |
if is_service_enabled s-proxy; then |
178 | 178 |
|
179 |
- GLANCE_SWIFT_USER=$(get_or_create_user "glance-swift" \ |
|
179 |
+ local glance_swift_user=$(get_or_create_user "glance-swift" \ |
|
180 | 180 |
"$SERVICE_PASSWORD" $SERVICE_TENANT_NAME "glance-swift@example.com") |
181 |
- get_or_add_user_role "ResellerAdmin" $GLANCE_SWIFT_USER $SERVICE_TENANT_NAME |
|
181 |
+ get_or_add_user_role "ResellerAdmin" $glance_swift_user $SERVICE_TENANT_NAME |
|
182 | 182 |
fi |
183 | 183 |
|
184 | 184 |
if [[ "$KEYSTONE_CATALOG_BACKEND" = 'sql' ]]; then |
185 | 185 |
|
186 |
- GLANCE_SERVICE=$(get_or_create_service "glance" \ |
|
186 |
+ local glance_service=$(get_or_create_service "glance" \ |
|
187 | 187 |
"image" "Glance Image Service") |
188 |
- get_or_create_endpoint $GLANCE_SERVICE \ |
|
188 |
+ get_or_create_endpoint $glance_service \ |
|
189 | 189 |
"$REGION_NAME" \ |
190 | 190 |
"http://$GLANCE_HOSTPORT" \ |
191 | 191 |
"http://$GLANCE_HOSTPORT" \ |
... | ... |
@@ -57,18 +57,18 @@ TEMPEST_SERVICES+=,sahara |
57 | 57 |
# service sahara admin |
58 | 58 |
function create_sahara_accounts { |
59 | 59 |
|
60 |
- SERVICE_TENANT=$(openstack project list | awk "/ $SERVICE_TENANT_NAME / { print \$2 }") |
|
61 |
- ADMIN_ROLE=$(openstack role list | awk "/ admin / { print \$2 }") |
|
60 |
+ local service_tenant=$(openstack project list | awk "/ $SERVICE_TENANT_NAME / { print \$2 }") |
|
61 |
+ local admin_role=$(openstack role list | awk "/ admin / { print \$2 }") |
|
62 | 62 |
|
63 |
- SAHARA_USER=$(get_or_create_user "sahara" \ |
|
64 |
- "$SERVICE_PASSWORD" $SERVICE_TENANT) |
|
65 |
- get_or_add_user_role $ADMIN_ROLE $SAHARA_USER $SERVICE_TENANT |
|
63 |
+ local sahara_user=$(get_or_create_user "sahara" \ |
|
64 |
+ "$SERVICE_PASSWORD" $service_tenant) |
|
65 |
+ get_or_add_user_role $admin_role $sahara_user $service_tenant |
|
66 | 66 |
|
67 | 67 |
if [[ "$KEYSTONE_CATALOG_BACKEND" = 'sql' ]]; then |
68 | 68 |
|
69 |
- SAHARA_SERVICE=$(get_or_create_service "sahara" \ |
|
69 |
+ local sahara_service=$(get_or_create_service "sahara" \ |
|
70 | 70 |
"data_processing" "Sahara Data Processing") |
71 |
- get_or_create_endpoint $SAHARA_SERVICE \ |
|
71 |
+ get_or_create_endpoint $sahara_service \ |
|
72 | 72 |
"$REGION_NAME" \ |
73 | 73 |
"$SAHARA_SERVICE_PROTOCOL://$SAHARA_SERVICE_HOST:$SAHARA_SERVICE_PORT/v1.1/\$(tenant_id)s" \ |
74 | 74 |
"$SAHARA_SERVICE_PROTOCOL://$SAHARA_SERVICE_HOST:$SAHARA_SERVICE_PORT/v1.1/\$(tenant_id)s" \ |
... | ... |
@@ -76,21 +76,20 @@ function setup_trove_logging { |
76 | 76 |
# service trove admin # if enabled |
77 | 77 |
|
78 | 78 |
function create_trove_accounts { |
79 |
- # Trove |
|
80 |
- SERVICE_TENANT=$(openstack project list | awk "/ $SERVICE_TENANT_NAME / { print \$2 }") |
|
81 |
- SERVICE_ROLE=$(openstack role list | awk "/ admin / { print \$2 }") |
|
79 |
+ local service_tenant=$(openstack project list | awk "/ $SERVICE_TENANT_NAME / { print \$2 }") |
|
80 |
+ local service_role=$(openstack role list | awk "/ admin / { print \$2 }") |
|
82 | 81 |
|
83 | 82 |
if [[ "$ENABLED_SERVICES" =~ "trove" ]]; then |
84 | 83 |
|
85 |
- TROVE_USER=$(get_or_create_user "trove" \ |
|
86 |
- "$SERVICE_PASSWORD" $SERVICE_TENANT) |
|
87 |
- get_or_add_user_role $SERVICE_ROLE $TROVE_USER $SERVICE_TENANT |
|
84 |
+ local trove_user=$(get_or_create_user "trove" \ |
|
85 |
+ "$SERVICE_PASSWORD" $service_tenant) |
|
86 |
+ get_or_add_user_role $service_role $trove_user $service_tenant |
|
88 | 87 |
|
89 | 88 |
if [[ "$KEYSTONE_CATALOG_BACKEND" = 'sql' ]]; then |
90 | 89 |
|
91 |
- TROVE_SERVICE=$(get_or_create_service "trove" \ |
|
90 |
+ local trove_service=$(get_or_create_service "trove" \ |
|
92 | 91 |
"database" "Trove Service") |
93 |
- get_or_create_endpoint $TROVE_SERVICE \ |
|
92 |
+ get_or_create_endpoint $trove_service \ |
|
94 | 93 |
"$REGION_NAME" \ |
95 | 94 |
"http://$SERVICE_HOST:8779/v1.0/\$(tenant_id)s" \ |
96 | 95 |
"http://$SERVICE_HOST:8779/v1.0/\$(tenant_id)s" \ |
... | ... |
@@ -237,6 +236,7 @@ function start_trove { |
237 | 237 |
# stop_trove() - Stop running processes |
238 | 238 |
function stop_trove { |
239 | 239 |
# Kill the trove screen windows |
240 |
+ local serv |
|
240 | 241 |
for serv in tr-api tr-tmgr tr-cond; do |
241 | 242 |
screen_stop $serv |
242 | 243 |
done |