|
...
|
...
|
@@ -192,7 +192,7 @@ if [[ $EUID -eq 0 ]]; then
|
|
192
|
192
|
useradd -g stack -s /bin/bash -d $DEST -m stack
|
|
193
|
193
|
fi
|
|
194
|
194
|
|
|
195
|
|
- echo "Giving stack user passwordless sudo priviledges"
|
|
|
195
|
+ echo "Giving stack user passwordless sudo privileges"
|
|
196
|
196
|
# UEC images ``/etc/sudoers`` does not have a ``#includedir``, add one
|
|
197
|
197
|
grep -q "^#includedir.*/etc/sudoers.d" /etc/sudoers ||
|
|
198
|
198
|
echo "#includedir /etc/sudoers.d" >> /etc/sudoers
|
|
...
|
...
|
@@ -927,8 +927,8 @@ EOF
|
|
927
|
927
|
fi
|
|
928
|
928
|
|
|
929
|
929
|
|
|
930
|
|
-# Finalize queue instllation
|
|
931
|
|
-# --------------------------
|
|
|
930
|
+# Finalize queue installation
|
|
|
931
|
+# ----------------------------
|
|
932
|
932
|
|
|
933
|
933
|
if is_service_enabled rabbit; then
|
|
934
|
934
|
# Start rabbitmq-server
|
|
...
|
...
|
@@ -990,7 +990,7 @@ fi
|
|
990
|
990
|
# Create a new named screen to run processes in
|
|
991
|
991
|
screen -d -m -S $SCREEN_NAME -t shell -s /bin/bash
|
|
992
|
992
|
sleep 1
|
|
993
|
|
-# Set a reasonable statusbar
|
|
|
993
|
+# Set a reasonable status bar
|
|
994
|
994
|
screen -r $SCREEN_NAME -X hardstatus alwayslastline "$SCREEN_HARDSTATUS"
|
|
995
|
995
|
|
|
996
|
996
|
|
|
...
|
...
|
@@ -1522,8 +1522,8 @@ if is_service_enabled n-api; then
|
|
1522
|
1522
|
# Get the sample configuration file in place
|
|
1523
|
1523
|
cp $NOVA_DIR/etc/nova/api-paste.ini $NOVA_CONF_DIR
|
|
1524
|
1524
|
|
|
1525
|
|
- # Rewrite the authtoken configration for our Keystone service.
|
|
1526
|
|
- # This is a bit defensive to allow the sample file some varaince.
|
|
|
1525
|
+ # Rewrite the authtoken configuration for our Keystone service.
|
|
|
1526
|
+ # This is a bit defensive to allow the sample file some variance.
|
|
1527
|
1527
|
sed -e "
|
|
1528
|
1528
|
/^admin_token/i admin_tenant_name = $SERVICE_TENANT_NAME
|
|
1529
|
1529
|
/admin_tenant_name/s/^.*$/admin_tenant_name = $SERVICE_TENANT_NAME/;
|
|
...
|
...
|
@@ -1735,12 +1735,12 @@ if is_service_enabled swift; then
|
|
1735
|
1735
|
sudo chown -R $USER: ${SWIFT_CONFIG_DIR} /var/run/swift
|
|
1736
|
1736
|
|
|
1737
|
1737
|
if [[ "$SWIFT_CONFIG_DIR" != "/etc/swift" ]]; then
|
|
1738
|
|
- # Some swift tools are hard-coded to use ``/etc/swift`` and are apparenty not going to be fixed.
|
|
|
1738
|
+ # Some swift tools are hard-coded to use ``/etc/swift`` and are apparently not going to be fixed.
|
|
1739
|
1739
|
# Create a symlink if the config dir is moved
|
|
1740
|
1740
|
sudo ln -sf ${SWIFT_CONFIG_DIR} /etc/swift
|
|
1741
|
1741
|
fi
|
|
1742
|
1742
|
|
|
1743
|
|
- # Swift use rsync to syncronize between all the different
|
|
|
1743
|
+ # Swift use rsync to synchronize between all the different
|
|
1744
|
1744
|
# partitions (which make more sense when you have a multi-node
|
|
1745
|
1745
|
# setup) we configure it with our version of rsync.
|
|
1746
|
1746
|
sed -e "
|