merge from master as of icehouse release - ironic:SSH_port, neutron:VPNaas, rsyslog conservatism#54
Closed
nimbosa wants to merge 10 commits intoopenstack:stable/icehousefrom
Closed
merge from master as of icehouse release - ironic:SSH_port, neutron:VPNaas, rsyslog conservatism#54nimbosa wants to merge 10 commits intoopenstack:stable/icehousefrom
nimbosa wants to merge 10 commits intoopenstack:stable/icehousefrom
Conversation
updated to use openstack-icehouse repos instead of havana release
Includes two enhancements to support VPNaaS and allow other vendor implementation support. Goal is to provide a solution for VPN .ini files until a more general solution can be defined to handle all reference and vendor .ini files. First, the /opt/stack/neutron/etc/vpn_agent.ini file is copied to /etc/neutron, to allow the selected device drivers for agent to be specified. Both reference and vendor implementations can be uncommented in this file, prior to stacking. Second, to allow vendor VPN implementations to provide an .ini file to the agent at start-up time, an environment variable is defined and can be set in the localrc to specify one or more .ini files. The desire is NOT to include vendor settings in the global vpn_agent.ini. Change-Id: Ia8250db660216a5296cb6ba2af1538b8c90d187c Closes-Bug: 1301552
The sshd reconfiguration to listen on port 2222 provides no benefit and complicates deployment on some systems. This removes the reconfiguration and instead just confirms SSH connectivity. Default SSH host and ports are left configurable, but the port now reflects the default 22. Change-Id: Iaf7c71854c3741a505a79037ffb8c86ace74fc27
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
manual local merge stack.sh from devstack-icehouse/master to devstack/stable/icehouse nimbosa/devstack-icehouse forked from openstack-dev/devstack, merged
merge diff from 2014 March to April 17
|
Thank you for contributing to openstack-dev/devstack! openstack-dev/devstack uses Gerrit for code review. Please visit http://wiki.openstack.org/GerritWorkflow and follow the |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Merge "Remove sshd reconfig from lib/ironic" 279d2be
Merge "Devstack support for Neutron VPNaaS" 1593db2
Merge "Do not modify rsyslog files if rsyslog is not used."