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

Changes from 1 commit
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
Prev Previous commit
Next Next commit
Do not modify rsyslog files if rsyslog is not used. 
Swift was missing an 'if [[ $SYSLOG != "False" ]]' statement which is used
by other services, and therefor failed with a 'No such file or directory'
error when 'SYSLOG=False' was set in localrc.

Closes-Bug: 1308461

Change-Id: I8655a955ebb322516d92bee418b93d4cc23bdc5c
  • Loading branch information
Yves-Gwenael Bourhis
Yves-Gwenael Bourhis committed Apr 17, 2014
commit f894c2ab805f9dfc0dfdd3668ccd3a83ee4eb9f2
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