2 /usr/demo/openstack/keystone in order to use the standard Solaris UNIX |
2 /usr/demo/openstack/keystone in order to use the standard Solaris UNIX |
3 commands rather than the GNU ones. It also includes a corrected fix for |
3 commands rather than the GNU ones. It also includes a corrected fix for |
4 Launchpad bug 1260556. This is a Solaris-specific patch and is not |
4 Launchpad bug 1260556. This is a Solaris-specific patch and is not |
5 suitable for the upstream. |
5 suitable for the upstream. |
6 |
6 |
7 --- heat-2013.2.3/bin/heat-keystone-setup.~1~ 2014-04-03 11:44:49.000000000 -0700 |
7 --- heat-2014.2.2/bin/heat-keystone-setup.orig 2014-08-07 15:08:53.000000000 -0700 |
8 +++ heat-2013.2.3/bin/heat-keystone-setup 2014-07-16 20:28:16.316132723 -0700 |
8 +++ heat-2014.2.2/bin/heat-keystone-setup 2014-09-20 21:44:41.866870651 -0700 |
9 @@ -2,12 +2,14 @@ |
9 @@ -2,12 +2,14 @@ |
10 |
10 |
11 set +e |
11 set +e |
12 |
12 |
13 +PATH=/usr/bin |
13 +PATH=/usr/bin |
20 - CONFIG_ADMIN_PORT=$(sed 's/[[:space:]]//g' $KEYSTONE_CONF | grep ^admin_port= | cut -d'=' -f2) |
20 - CONFIG_ADMIN_PORT=$(sed 's/[[:space:]]//g' $KEYSTONE_CONF | grep ^admin_port= | cut -d'=' -f2) |
21 + CONFIG_SERVICE_TOKEN=$(tr -d '[\t ]' < $KEYSTONE_CONF | grep ^admin_token= | cut -d'=' -f2) |
21 + CONFIG_SERVICE_TOKEN=$(tr -d '[\t ]' < $KEYSTONE_CONF | grep ^admin_token= | cut -d'=' -f2) |
22 + CONFIG_ADMIN_PORT=$(tr -d '[\t ]' < $KEYSTONE_CONF | grep ^admin_port= | cut -d'=' -f2) |
22 + CONFIG_ADMIN_PORT=$(tr -d '[\t ]' < $KEYSTONE_CONF | grep ^admin_port= | cut -d'=' -f2) |
23 fi |
23 fi |
24 |
24 |
25 SERVICE_TOKEN=${SERVICE_TOKEN:-$CONFIG_SERVICE_TOKEN} |
25 SERVICE_TOKEN=${OS_SERVICE_TOKEN:-$CONFIG_SERVICE_TOKEN} |
26 @@ -35,7 +37,7 @@ |
26 @@ -102,7 +104,7 @@ get_data() { |
27 shift 3 |
27 shift 3 |
28 |
28 |
29 echo $("$@" | \ |
29 output=$("$@" | \ |
30 - awk -F'|' \ |
30 - awk -F'|' \ |
31 + nawk -F'|' \ |
31 + nawk -F'|' \ |
32 "! /^\+/ && \$${match_column} ~ \"^ *${regex} *\$\" \ |
32 "! /^\+/ && \$${match_column} ~ \"^ *${regex} *\$\" \ |
33 { print \$${output_column} }") |
33 { print \$${output_column} }") |
34 } |
34 |
35 @@ -47,7 +49,7 @@ |
35 @@ -116,7 +118,7 @@ get_id () { |
36 get_column_num() { |
36 get_column_num() { |
37 local name=$1 |
37 local name=$1 |
38 shift |
38 shift |
39 - $@ | awk -F'|' "NR == 2 { for (i=2; i<NF; i++) if (\$i ~ \"^ *${name} *\$\") print (i - 1) }" |
39 - $@ | awk -F'|' "NR == 2 && /^|/ { for (i=2; i<NF; i++) if (\$i ~ \"^ *${name} *\$\") print (i - 1) }" |
40 + $@ | nawk -F'|' "/^\|/ { for (i=2; i<NF; i++) if (\$i ~ \"^ *${name} *\$\") print (i - 1); exit }" |
40 + $@ | nawk -F'|' "NR == 2 && /^\|/ { for (i=2; i<NF; i++) if (\$i ~ \"^ *${name} *\$\") print (i - 1) }" |
41 } |
41 } |
42 |
42 |
43 get_user() { |
43 get_user() { |
44 @@ -137,7 +139,7 @@ |
44 @@ -208,7 +210,7 @@ delete_endpoint() { |
45 |
45 |
46 local url=$(get_data 1 "${service_type}[.]publicURL" 2 \ |
46 local url=$(get_data 1 "${service_type}[.]publicURL" 2 \ |
47 get_endpoint $service_type 2>/dev/null | \ |
47 get_endpoint $service_type 2>/dev/null | \ |
48 - sed -r "s/[a-f0-9]{32}/$urlsuffix/") |
48 - sed -r "s/[a-f0-9]{32}/$urlsuffix/") |
49 + sed "s/[a-f0-9]\{32\}/$urlsuffix/") |
49 + sed "s/[a-f0-9]\{32\}/$urlsuffix/") |
50 |
50 |
51 if [ -n "$url" ]; then |
51 if [ -n "$url" ]; then |
52 local endpoints=$(get_data 3 $url 1 keystone endpoint-list) |
52 local endpoints=$(get_data 3 $url 1 keystone endpoint-list) |
53 @@ -199,7 +201,7 @@ |
53 @@ -280,7 +282,7 @@ keystone_setup() { |
54 |
54 die_if_not_set $LINENO ADMIN_ROLE "Fail to get ADMIN_ROLE by 'keystone role-list' " |
55 ADMIN_ROLE=$(get_data 2 admin 1 keystone role-list) |
|
56 SERVICE_TENANT=$(get_data 2 service 1 keystone tenant-list) |
55 SERVICE_TENANT=$(get_data 2 service 1 keystone tenant-list) |
|
56 die_if_not_set $LINENO SERVICE_TENANT "Fail to get service tenant 'keystone tenant-list' " |
57 - SERVICE_PASSWORD=${SERVICE_PASSWORD:-$OS_PASSWORD} |
57 - SERVICE_PASSWORD=${SERVICE_PASSWORD:-$OS_PASSWORD} |
58 + SERVICE_PASSWORD=${SERVICE_PASSWORD:-heat} |
58 + SERVICE_PASSWORD=${SERVICE_PASSWORD:-heat} |
59 SERVICE_HOST=${SERVICE_HOST:-localhost} |
59 SERVICE_HOST=${SERVICE_HOST:-localhost} |
60 |
60 |
61 if [[ "$SERVICE_PASSWORD" == "$OS_PASSWORD" ]]; then |
61 if [[ "$SERVICE_PASSWORD" == "$OS_PASSWORD" ]]; then |