Skip to content

merge from master as of icehouse release - ironic:SSH_port, neutron:VPNaas, rsyslog conservatism #54

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
nimbosa wants to merge 10 commits into from
Closed

merge from master as of icehouse release - ironic:SSH_port, neutron:VPNaas, rsyslog conservatism #54

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
a93682e
update stack.sh to use openstack-icehouse repos
nimbosa Apr 9, 2014
746dcee
Devstack support for Neutron VPNaaS
Apr 2, 2014
8676510
Remove sshd reconfig from lib/ironic
gandelman-a Apr 14, 2014
f894c2a
Do not modify rsyslog files if rsyslog is not used.
Apr 16, 2014
279d2be
Merge "Remove sshd reconfig from lib/ironic"
Apr 17, 2014
1593db2
Merge "Devstack support for Neutron VPNaaS"
Apr 17, 2014
6ee8cf8
Merge "Do not modify rsyslog files if rsyslog is not used."
Apr 17, 2014
3c1befa
manual local merge to stable/icehouse
nimbosa Apr 19, 2014
afa8bc8
Merge pull request #2 from openstack-dev/stable/icehouse
nimbosa Apr 19, 2014
d14c203
Merge pull request #1 from openstack-dev/master
nimbosa Apr 19, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 2 additions & 23 deletions lib/ironic
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ IRONIC_SSH_KEY_FILENAME=${IRONIC_SSH_KEY_FILENAME:-ironic_key}
IRONIC_KEY_FILE=$IRONIC_SSH_KEY_DIR/$IRONIC_SSH_KEY_FILENAME
IRONIC_SSH_VIRT_TYPE=${IRONIC_SSH_VIRT_TYPE:-virsh}
IRONIC_TFTPBOOT_DIR=${IRONIC_TFTPBOOT_DIR:-$IRONIC_DATA_DIR/tftpboot}
IRONIC_VM_SSH_PORT=${IRONIC_VM_SSH_PORT:-2222}
IRONIC_VM_SSH_PORT=${IRONIC_VM_SSH_PORT:-22}
IRONIC_VM_SSH_ADDRESS=${IRONIC_VM_SSH_ADDRESS:-$HOST_IP}
IRONIC_VM_COUNT=${IRONIC_VM_COUNT:-1}
IRONIC_VM_SPECS_CPU=${IRONIC_VM_SPECS_CPU:-1}
Expand Down Expand Up @@ -432,31 +432,10 @@ function ironic_ssh_check {
fi
}

function configure_ironic_sshd {
# Ensure sshd server accepts connections from localhost only

SSH_CONFIG=/etc/ssh/sshd_config
HOST_PORT=$IRONIC_VM_SSH_ADDRESS:$IRONIC_VM_SSH_PORT
if ! sudo grep ListenAddress $SSH_CONFIG | grep $HOST_PORT; then
echo "ListenAddress $HOST_PORT" | sudo tee -a $SSH_CONFIG
fi

SSH_SERVICE_NAME=sshd
if is_ubuntu; then
SSH_SERVICE_NAME=ssh
fi

restart_service $SSH_SERVICE_NAME
# to ensure ssh service is up and running
sleep 3
ironic_ssh_check $IRONIC_SSH_KEY_DIR/$IRONIC_SSH_KEY_FILENAME $IRONIC_VM_SSH_ADDRESS $IRONIC_VM_SSH_PORT $IRONIC_SSH_USERNAME 10

}

function configure_ironic_auxiliary {
configure_ironic_dirs
configure_ironic_ssh_keypair
configure_ironic_sshd
ironic_ssh_check $IRONIC_SSH_KEY_DIR/$IRONIC_SSH_KEY_FILENAME $IRONIC_VM_SSH_ADDRESS $IRONIC_VM_SSH_PORT $IRONIC_SSH_USERNAME 10
}

# build deploy kernel+ramdisk, then upload them to glance
Expand Down
16 changes: 15 additions & 1 deletion lib/neutron
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,10 @@ Q_L3_ROUTER_PER_TENANT=${Q_L3_ROUTER_PER_TENANT:-False}
# See _configure_neutron_common() for details about setting it up
declare -a Q_PLUGIN_EXTRA_CONF_FILES

# List of (optional) config files for VPN device drivers to use with
# the neutron-q-vpn agent
declare -a Q_VPN_EXTRA_CONF_FILES


Q_RR_CONF_FILE=$NEUTRON_CONF_DIR/rootwrap.conf
if [[ "$Q_USE_ROOTWRAP" == "False" ]]; then
Expand Down Expand Up @@ -495,7 +499,7 @@ function start_neutron_agents {
L3_CONF_FILES="$L3_CONF_FILES --config-file $Q_FWAAS_CONF_FILE"
fi
if is_service_enabled q-vpn; then
screen_it q-vpn "cd $NEUTRON_DIR && $AGENT_VPN_BINARY $L3_CONF_FILES"
screen_it q-vpn "cd $NEUTRON_DIR && $AGENT_VPN_BINARY $VPN_CONF_FILES"
else
screen_it q-l3 "cd $NEUTRON_DIR && python $AGENT_L3_BINARY $L3_CONF_FILES"
fi
Expand Down Expand Up @@ -658,6 +662,7 @@ function _configure_neutron_dhcp_agent {
}

function _configure_neutron_l3_agent {
local cfg_file
Q_L3_ENABLED=True
# for l3-agent, only use per tenant router if we have namespaces
Q_L3_ROUTER_PER_TENANT=$Q_USE_NAMESPACE
Expand All @@ -669,6 +674,15 @@ function _configure_neutron_l3_agent {
Q_FWAAS_CONF_FILE=$NEUTRON_CONF_DIR/fwaas_driver.ini
fi

if is_service_enabled q-vpn; then
Q_VPN_CONF_FILE=$NEUTRON_CONF_DIR/vpn_agent.ini
cp $NEUTRON_DIR/etc/vpn_agent.ini $Q_VPN_CONF_FILE
VPN_CONF_FILES="--config-file $NEUTRON_CONF --config-file=$Q_L3_CONF_FILE --config-file=$Q_VPN_CONF_FILE"
for cfg_file in ${Q_VPN_EXTRA_CONF_FILES[@]}; do
VPN_CONF_FILES+=" --config-file $cfg_file"
done
fi

cp $NEUTRON_DIR/etc/l3_agent.ini $Q_L3_CONF_FILE

iniset $Q_L3_CONF_FILE DEFAULT verbose True
Expand Down
11 changes: 7 additions & 4 deletions lib/swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -453,10 +453,13 @@ EOF
rm -rf ${swift_log_dir}
mkdir -p ${swift_log_dir}/hourly
sudo chown -R ${STACK_USER}:adm ${swift_log_dir}
sed "s,%SWIFT_LOGDIR%,${swift_log_dir}," $FILES/swift/rsyslog.conf | sudo \
tee /etc/rsyslog.d/10-swift.conf
# restart syslog to take the changes
sudo killall -HUP rsyslogd

if [[ $SYSLOG != "False" ]]; then
sed "s,%SWIFT_LOGDIR%,${swift_log_dir}," $FILES/swift/rsyslog.conf | sudo \
tee /etc/rsyslog.d/10-swift.conf
# restart syslog to take the changes
sudo killall -HUP rsyslogd
fi

if is_apache_enabled_service swift; then
_config_swift_apache_wsgi
Expand Down