Merge remote-tracking branch 'origin/master' into pause
This commit is contained in:
commit
a2710c518a
4 changed files with 19 additions and 4 deletions
|
@ -27,7 +27,7 @@ registry_port = 9191
|
||||||
log_file = %DEST%/glance/api.log
|
log_file = %DEST%/glance/api.log
|
||||||
|
|
||||||
# Send logs to syslog (/dev/log) instead of to file specified by `log_file`
|
# Send logs to syslog (/dev/log) instead of to file specified by `log_file`
|
||||||
use_syslog = False
|
use_syslog = %SYSLOG%
|
||||||
|
|
||||||
# ============ Notification System Options =====================
|
# ============ Notification System Options =====================
|
||||||
|
|
||||||
|
|
|
@ -19,7 +19,7 @@ log_file = %DEST%/glance/registry.log
|
||||||
filesystem_store_datadir = %DEST%/glance/images
|
filesystem_store_datadir = %DEST%/glance/images
|
||||||
|
|
||||||
# Send logs to syslog (/dev/log) instead of to file specified by `log_file`
|
# Send logs to syslog (/dev/log) instead of to file specified by `log_file`
|
||||||
use_syslog = False
|
use_syslog = %SYSLOG%
|
||||||
|
|
||||||
# SQLAlchemy connection string for the reference implementation
|
# SQLAlchemy connection string for the reference implementation
|
||||||
# registry server. Any valid SQLAlchemy connection string is fine.
|
# registry server. Any valid SQLAlchemy connection string is fine.
|
||||||
|
|
10
stack.sh
10
stack.sh
|
@ -78,6 +78,9 @@ source ./stackrc
|
||||||
# Destination path for installation ``DEST``
|
# Destination path for installation ``DEST``
|
||||||
DEST=${DEST:-/opt/stack}
|
DEST=${DEST:-/opt/stack}
|
||||||
|
|
||||||
|
# Configure services to syslog instead of writing to individual log files
|
||||||
|
SYSLOG=${SYSLOG:-False}
|
||||||
|
|
||||||
# OpenStack is designed to be run as a regular user (Dashboard will fail to run
|
# OpenStack is designed to be run as a regular user (Dashboard will fail to run
|
||||||
# as root, since apache refused to startup serve content from root user). If
|
# as root, since apache refused to startup serve content from root user). If
|
||||||
# stack.sh is run as root, it automatically creates a stack user with
|
# stack.sh is run as root, it automatically creates a stack user with
|
||||||
|
@ -207,7 +210,7 @@ function read_password {
|
||||||
PUBLIC_INTERFACE=${PUBLIC_INTERFACE:-eth0}
|
PUBLIC_INTERFACE=${PUBLIC_INTERFACE:-eth0}
|
||||||
FIXED_RANGE=${FIXED_RANGE:-10.0.0.0/24}
|
FIXED_RANGE=${FIXED_RANGE:-10.0.0.0/24}
|
||||||
FIXED_NETWORK_SIZE=${FIXED_NETWORK_SIZE:-256}
|
FIXED_NETWORK_SIZE=${FIXED_NETWORK_SIZE:-256}
|
||||||
FLOATING_RANGE=${FLOATING_RANGE:-172.24.4.1/28}
|
FLOATING_RANGE=${FLOATING_RANGE:-172.24.4.224/28}
|
||||||
NET_MAN=${NET_MAN:-FlatDHCPManager}
|
NET_MAN=${NET_MAN:-FlatDHCPManager}
|
||||||
EC2_DMZ_HOST=${EC2_DMZ_HOST:-$HOST_IP}
|
EC2_DMZ_HOST=${EC2_DMZ_HOST:-$HOST_IP}
|
||||||
FLAT_NETWORK_BRIDGE=${FLAT_NETWORK_BRIDGE:-br100}
|
FLAT_NETWORK_BRIDGE=${FLAT_NETWORK_BRIDGE:-br100}
|
||||||
|
@ -478,11 +481,13 @@ if [[ "$ENABLED_SERVICES" =~ "g-reg" ]]; then
|
||||||
sudo sed -e "s,%SQL_CONN%,$BASE_SQL_CONN/glance,g" -i $GLANCE_CONF
|
sudo sed -e "s,%SQL_CONN%,$BASE_SQL_CONN/glance,g" -i $GLANCE_CONF
|
||||||
sudo sed -e "s,%SERVICE_TOKEN%,$SERVICE_TOKEN,g" -i $GLANCE_CONF
|
sudo sed -e "s,%SERVICE_TOKEN%,$SERVICE_TOKEN,g" -i $GLANCE_CONF
|
||||||
sudo sed -e "s,%DEST%,$DEST,g" -i $GLANCE_CONF
|
sudo sed -e "s,%DEST%,$DEST,g" -i $GLANCE_CONF
|
||||||
|
sudo sed -e "s,%SYSLOG%,$SYSLOG,g" -i $GLANCE_CONF
|
||||||
|
|
||||||
GLANCE_API_CONF=$GLANCE_DIR/etc/glance-api.conf
|
GLANCE_API_CONF=$GLANCE_DIR/etc/glance-api.conf
|
||||||
cp $FILES/glance-api.conf $GLANCE_API_CONF
|
cp $FILES/glance-api.conf $GLANCE_API_CONF
|
||||||
sudo sed -e "s,%DEST%,$DEST,g" -i $GLANCE_API_CONF
|
sudo sed -e "s,%DEST%,$DEST,g" -i $GLANCE_API_CONF
|
||||||
sudo sed -e "s,%SERVICE_TOKEN%,$SERVICE_TOKEN,g" -i $GLANCE_API_CONF
|
sudo sed -e "s,%SERVICE_TOKEN%,$SERVICE_TOKEN,g" -i $GLANCE_API_CONF
|
||||||
|
sudo sed -e "s,%SYSLOG%,$SYSLOG,g" -i $GLANCE_API_CONF
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Nova
|
# Nova
|
||||||
|
@ -628,6 +633,9 @@ if [ -n "$MULTI_HOST" ]; then
|
||||||
add_nova_flag "--multi_host=$MULTI_HOST"
|
add_nova_flag "--multi_host=$MULTI_HOST"
|
||||||
add_nova_flag "--send_arp_for_ha=1"
|
add_nova_flag "--send_arp_for_ha=1"
|
||||||
fi
|
fi
|
||||||
|
if [ "$SYSLOG" != "False" ]; then
|
||||||
|
add_nova_flag "--use_syslog=1"
|
||||||
|
fi
|
||||||
|
|
||||||
# Nova Database
|
# Nova Database
|
||||||
# ~~~~~~~~~~~~~
|
# ~~~~~~~~~~~~~
|
||||||
|
|
|
@ -341,7 +341,14 @@ chroot $ROOTFS chown -R stack $DEST
|
||||||
# Change boot params so that we get a console log
|
# Change boot params so that we get a console log
|
||||||
sudo sed -e "s/quiet splash/splash console=ttyS0 console=ttyS1,19200n8/g" -i $ROOTFS/boot/grub/menu.lst
|
sudo sed -e "s/quiet splash/splash console=ttyS0 console=ttyS1,19200n8/g" -i $ROOTFS/boot/grub/menu.lst
|
||||||
sudo sed -e "s/^hiddenmenu//g" -i $ROOTFS/boot/grub/menu.lst
|
sudo sed -e "s/^hiddenmenu//g" -i $ROOTFS/boot/grub/menu.lst
|
||||||
#chroot $ROOTFS grub-install /dev/vda
|
|
||||||
|
# Set the hostname
|
||||||
|
echo $GUEST_NAME > $ROOTFS/etc/hostname
|
||||||
|
|
||||||
|
# We need the hostname to resolve for rabbit to launch
|
||||||
|
if ! grep -q $GUEST_NAME $ROOTFS/etc/hosts; then
|
||||||
|
echo "$GUEST_IP $GUEST_NAME" >> $ROOTFS/etc/hosts
|
||||||
|
fi
|
||||||
|
|
||||||
# Unmount
|
# Unmount
|
||||||
umount $ROOTFS || echo 'ok'
|
umount $ROOTFS || echo 'ok'
|
||||||
|
|
Loading…
Reference in a new issue