You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by sw...@apache.org on 2016/06/28 15:28:49 UTC
[15/15] git commit: updated refs/heads/master to e4ba640
Merge pull request #1547 from PCextreme/vrouter-fixes
Fixes for VirtualRouters in Basic Networking, especially with mutliple ranges in VLANsDuring the last few modifications on the SystemVM scripts, it turns out quite a lot of stuff broke in our setups.
This PR fixes a number of things:
* Multiple IP's per VLAN interface are now supported & working again, including DNS, DHCP ranges, password and metadata services
* `useextdns` fixed (I had a small merge conflict with an attempt to fix this at 4.7, but these fixes are more comprehensive)
* CLOUDSTACK-8303
* Apache configs better in line with best-practices and distro-expected locations
* Added a few more helper functions & getters & setters for utility
* some minor cleanup & fixes
* pr/1547:
Remove /etc/apache2/sites-enabled/000-default in cloud-early-config
SysVM various fixes to previous refactorings * make CORS include a regular glob-matched one * fix NameVirtualHost in CsApp.py as well * even moar cleanups
SysVM: Cleanup and removal of old (and dangerous) config files * ports.conf * default & default-ssl sites * SSL config in httpd.conf * deprecated & dead setup_redundant_router in cloud-early-config
SysVM cloud-early-config: Intermediate fix for SecStore & CORS * Take setup from vhost.template rather than default(-ssl) * should move into Python CS code as well * Move CORS setup to separate conf * Modify vhost template to Optionally include the cors file * Add NameVirtualHost to vhost template for feature parity with ports.conf * Take setup from vhost.template rather than default(-ssl)
VR cloud-early-config: Commonize Apache2 common setup
VR cloud-early-config: Fix Apache2 alias cleanup
VR: consistent SSL setup, vhost is not an example, but a template
VR CsConfig: reintroduce old get_dns() behaviour for redundant non-VPC's
VR CsAddress fixes: * cleanup imports, * fix to_str(), * improve & fix service post_config logic * don't arpPing when there's no gateway
VR CsApp: Expose config to classes, move vhost confs to proper location, allow for multiple IP's per intf, sanitize servername, don't open port 53 if no DNS is foreseen
VR CsConfig: Add is_router(), is_dns(), has_dns(), has_metadata(), use_extdns(), fix get_dns() with use_extdns()
VR CsDhcp: allow multiple ranges & finite lease time (fixes CLOUDSTACK-8303)
VR CsGuestNetwork obey useextdns
VR merge.py ipalias fix & dhcpconfig stub notification
Signed-off-by: Will Stevens <wi...@gmail.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/e4ba640a
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/e4ba640a
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/e4ba640a
Branch: refs/heads/master
Commit: e4ba640a2870f0ed7cd092a1760b2d78e63c6258
Parents: f7f23ec 67eb6ca
Author: Will Stevens <wi...@gmail.com>
Authored: Tue Jun 28 11:28:06 2016 -0400
Committer: Will Stevens <wi...@gmail.com>
Committed: Tue Jun 28 11:28:07 2016 -0400
----------------------------------------------------------------------
LICENSE | 5 +-
pom.xml | 5 +-
.../debian/config/etc/apache2/httpd.conf | 4 +-
.../debian/config/etc/apache2/ports.conf | 23 --
.../config/etc/apache2/sites-available/default | 41 ----
.../etc/apache2/sites-available/default-ssl | 175 -------------
.../debian/config/etc/apache2/vhost.template | 245 +++++++++++++++++++
.../debian/config/etc/apache2/vhostexample.conf | 239 ------------------
.../debian/config/etc/init.d/cloud-early-config | 162 ++++--------
.../debian/config/opt/cloud/bin/cs/CsAddress.py | 35 +--
.../debian/config/opt/cloud/bin/cs/CsApp.py | 40 +--
.../debian/config/opt/cloud/bin/cs/CsConfig.py | 29 ++-
.../debian/config/opt/cloud/bin/cs/CsDhcp.py | 39 +--
.../config/opt/cloud/bin/cs/CsGuestNetwork.py | 16 +-
.../debian/config/opt/cloud/bin/merge.py | 31 +++
tools/whisker/LICENSE | 5 +-
tools/whisker/descriptor-for-packaging.xml | 5 +-
tools/whisker/descriptor.xml | 5 +-
18 files changed, 429 insertions(+), 675 deletions(-)
----------------------------------------------------------------------