...
|
...
|
@@ -1025,21 +1025,12 @@ start_dstat
|
1025
|
1025
|
# Keystone
|
1026
|
1026
|
# --------
|
1027
|
1027
|
|
1028
|
|
-if is_service_enabled keystone; then
|
1029
|
|
- echo_summary "Starting Keystone"
|
1030
|
|
-
|
1031
|
|
- if [ "$KEYSTONE_AUTH_HOST" == "$SERVICE_HOST" ]; then
|
1032
|
|
- init_keystone
|
1033
|
|
- start_keystone
|
1034
|
|
- bootstrap_keystone
|
1035
|
|
- fi
|
1036
|
|
-
|
1037
|
|
- # Rather than just export these, we write them out to a
|
1038
|
|
- # intermediate userrc file that can also be used to debug if
|
1039
|
|
- # something goes wrong between here and running
|
1040
|
|
- # tools/create_userrc.sh (this script relies on services other
|
1041
|
|
- # than keystone being available, so we can't call it right now)
|
1042
|
|
- cat > $TOP_DIR/userrc_early <<EOF
|
|
1028
|
+# Rather than just export these, we write them out to a
|
|
1029
|
+# intermediate userrc file that can also be used to debug if
|
|
1030
|
+# something goes wrong between here and running
|
|
1031
|
+# tools/create_userrc.sh (this script relies on services other
|
|
1032
|
+# than keystone being available, so we can't call it right now)
|
|
1033
|
+cat > $TOP_DIR/userrc_early <<EOF
|
1043
|
1034
|
# Use this for debugging issues before files in accrc are created
|
1044
|
1035
|
|
1045
|
1036
|
# Set up password auth credentials now that Keystone is bootstrapped
|
...
|
...
|
@@ -1054,12 +1045,21 @@ export OS_REGION_NAME=$KEYSTONE_REGION_NAME
|
1054
|
1054
|
|
1055
|
1055
|
EOF
|
1056
|
1056
|
|
1057
|
|
- if is_service_enabled tls-proxy; then
|
1058
|
|
- echo "export OS_CACERT=$INT_CA_DIR/ca-chain.pem" >> $TOP_DIR/userrc_early
|
1059
|
|
- start_tls_proxy http-services '*' 443 $SERVICE_HOST 80
|
1060
|
|
- fi
|
|
1057
|
+if is_service_enabled tls-proxy; then
|
|
1058
|
+ echo "export OS_CACERT=$INT_CA_DIR/ca-chain.pem" >> $TOP_DIR/userrc_early
|
|
1059
|
+ start_tls_proxy http-services '*' 443 $SERVICE_HOST 80
|
|
1060
|
+fi
|
|
1061
|
+
|
|
1062
|
+source $TOP_DIR/userrc_early
|
|
1063
|
+
|
|
1064
|
+if is_service_enabled keystone; then
|
|
1065
|
+ echo_summary "Starting Keystone"
|
1061
|
1066
|
|
1062
|
|
- source $TOP_DIR/userrc_early
|
|
1067
|
+ if [ "$KEYSTONE_AUTH_HOST" == "$SERVICE_HOST" ]; then
|
|
1068
|
+ init_keystone
|
|
1069
|
+ start_keystone
|
|
1070
|
+ bootstrap_keystone
|
|
1071
|
+ fi
|
1063
|
1072
|
|
1064
|
1073
|
create_keystone_accounts
|
1065
|
1074
|
create_nova_accounts
|