You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by da...@apache.org on 2014/09/04 11:06:12 UTC
[1/2] git commit: updated refs/heads/4.4 to eaf3ad1
Repository: cloudstack
Updated Branches:
refs/heads/4.4 7a57d780b -> eaf3ad1db
make virtual router /latest/.htaccess file be static - no longer dynamically generate it, remove code that managed the file previously
Signed-off-by: Sebastien Goasguen <ru...@gmail.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/54e9a92d
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/54e9a92d
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/54e9a92d
Branch: refs/heads/4.4
Commit: 54e9a92d24c2f2c6d40fb443f074d2cd7089516a
Parents: 4f494f7
Author: Fred Clift <fr...@clift.org>
Authored: Thu Aug 28 14:26:58 2014 -0600
Committer: Sebastien Goasguen <ru...@gmail.com>
Committed: Thu Sep 4 04:24:16 2014 -0400
----------------------------------------------------------------------
.../VirtualRoutingResourceTest.java | 1 +
.../networkservice/BaremetalPxeManagerImpl.java | 1 +
.../element/CloudZonesNetworkElement.java | 2 +-
.../VirtualNetworkApplianceManagerImpl.java | 2 +-
.../debian/config/opt/cloud/bin/vmdata.py | 57 +++-----------------
.../debian/config/var/www/html/latest/.htaccess | 25 +++++++--
6 files changed, 32 insertions(+), 56 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/54e9a92d/core/test/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResourceTest.java
----------------------------------------------------------------------
diff --git a/core/test/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResourceTest.java b/core/test/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResourceTest.java
index 531c718..9f6c0db 100644
--- a/core/test/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResourceTest.java
+++ b/core/test/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResourceTest.java
@@ -678,6 +678,7 @@ public class VirtualRoutingResourceTest implements VirtualRouterDeployer {
protected VmDataCommand generateVmDataCommand() {
VmDataCommand cmd = new VmDataCommand("10.1.10.4", "i-4-VM", true);
+ // if you add new metadata files, also edit systemvm/patches/debian/config/var/www/html/latest/.htaccess
cmd.addVmData("userdata", "user-data", "user-data");
cmd.addVmData("metadata", "service-offering", "serviceOffering");
cmd.addVmData("metadata", "availability-zone", "zoneName");
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/54e9a92d/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalPxeManagerImpl.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalPxeManagerImpl.java b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalPxeManagerImpl.java
index 261534a..353975b 100755
--- a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalPxeManagerImpl.java
+++ b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalPxeManagerImpl.java
@@ -200,6 +200,7 @@ public class BaremetalPxeManagerImpl extends ManagerBase implements BaremetalPxe
String zoneName = _dcDao.findById(vm.getDataCenterId()).getName();
NicVO nvo = _nicDao.findById(nic.getId());
VmDataCommand cmd = new VmDataCommand(nvo.getIp4Address(), vm.getInstanceName(), _ntwkModel.getExecuteInSeqNtwkElmtCmd());
+ // if you add new metadata files, also edit systemvm/patches/debian/config/var/www/html/latest/.htaccess
cmd.addVmData("userdata", "user-data", vm.getUserData());
cmd.addVmData("metadata", "service-offering", StringUtils.unicodeEscape(serviceOffering));
cmd.addVmData("metadata", "availability-zone", StringUtils.unicodeEscape(zoneName));
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/54e9a92d/server/src/com/cloud/network/element/CloudZonesNetworkElement.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/element/CloudZonesNetworkElement.java b/server/src/com/cloud/network/element/CloudZonesNetworkElement.java
index 55cd5fa..64a8cec 100644
--- a/server/src/com/cloud/network/element/CloudZonesNetworkElement.java
+++ b/server/src/com/cloud/network/element/CloudZonesNetworkElement.java
@@ -152,7 +152,7 @@ public class CloudZonesNetworkElement extends AdapterBase implements NetworkElem
private VmDataCommand generateVmDataCommand(String vmPrivateIpAddress, String userData, String serviceOffering, String zoneName, String guestIpAddress,
String vmName, String vmInstanceName, long vmId, String vmUuid, String publicKey) {
VmDataCommand cmd = new VmDataCommand(vmPrivateIpAddress, vmName, _networkMgr.getExecuteInSeqNtwkElmtCmd());
-
+ // if you add new metadata files, also edit systemvm/patches/debian/config/var/www/html/latest/.htaccess
cmd.addVmData("userdata", "user-data", userData);
cmd.addVmData("metadata", "service-offering", serviceOffering);
cmd.addVmData("metadata", "availability-zone", zoneName);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/54e9a92d/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
index 2363841..c165a7e 100755
--- a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
+++ b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
@@ -854,7 +854,7 @@ public class VirtualNetworkApplianceManagerImpl extends ManagerBase implements V
final DataCenterVO dcVo = _dcDao.findById(router.getDataCenterId());
cmd.setAccessDetail(NetworkElementCommand.ZONE_NETWORK_TYPE, dcVo.getNetworkType().toString());
-
+ // if you add new metadata files, also edit systemvm/patches/debian/config/var/www/html/latest/.htaccess
cmd.addVmData("userdata", "user-data", userData);
cmd.addVmData("metadata", "service-offering", StringUtils.unicodeEscape(serviceOffering));
cmd.addVmData("metadata", "availability-zone", StringUtils.unicodeEscape(zoneName));
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/54e9a92d/systemvm/patches/debian/config/opt/cloud/bin/vmdata.py
----------------------------------------------------------------------
diff --git a/systemvm/patches/debian/config/opt/cloud/bin/vmdata.py b/systemvm/patches/debian/config/opt/cloud/bin/vmdata.py
index a44c134..30f2705 100755
--- a/systemvm/patches/debian/config/opt/cloud/bin/vmdata.py
+++ b/systemvm/patches/debian/config/opt/cloud/bin/vmdata.py
@@ -6,9 +6,9 @@
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
-#
+#
# http://www.apache.org/licenses/LICENSE-2.0
-#
+#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -64,7 +64,7 @@ def main(argv):
deletefile(ip, folder, file)
else:
createfile(ip, folder, file, data)
-
+
if fpath != '':
fh.close()
os.remove(fpath)
@@ -77,7 +77,7 @@ def deletefile(ip, folder, file):
def createfile(ip, folder, file, data):
dest = "/var/www/html/" + folder + "/" + ip + "/" + file
- metamanifestdir = "/var/www/html/" + folder + "/" + ip
+ metamanifestdir = "/var/www/html/" + folder + "/" + ip
metamanifest = metamanifestdir + "/meta-data"
# base64 decode userdata
@@ -105,7 +105,7 @@ def createfile(ip, folder, file, data):
sys.exit(1)
if os.path.exists(metamanifest):
fh = open(metamanifest, "r+a")
- exflock(fh)
+ exflock(fh)
if not file in fh.read():
fh.write(file + '\n')
unflock(fh)
@@ -121,33 +121,6 @@ def createfile(ip, folder, file, data):
os.chmod(metamanifest, 0644)
def htaccess(ip, folder, file):
- entry = "RewriteRule ^" + file + "$ ../" + folder + "/%{REMOTE_ADDR}/" + file + " [L,NC,QSA]"
- htaccessFolder = "/var/www/html/latest"
- htaccessFile = htaccessFolder + "/.htaccess"
-
- try:
- os.mkdir(htaccessFolder,0755)
- except OSError as e:
- # error 17 is already exists, we do it this way for concurrency
- if e.errno != 17:
- print "failed to make directories " + htaccessFolder + " due to :" +e.strerror
- sys.exit(1)
-
- if os.path.exists(htaccessFile):
- fh = open(htaccessFile, "r+a")
- exflock(fh)
- if not entry in fh.read():
- fh.write(entry + '\n')
- unflock(fh)
- fh.close()
- else:
- fh = open(htaccessFile, "w")
- exflock(fh)
- fh.write("Options +FollowSymLinks\nRewriteEngine On\n\n")
- fh.write(entry + '\n')
- unflock(fh)
- fh.close()
-
entry="Options -Indexes\nOrder Deny,Allow\nDeny from all\nAllow from " + ip
htaccessFolder = "/var/www/html/" + folder + "/" + ip
htaccessFile = htaccessFolder+"/.htaccess"
@@ -166,24 +139,6 @@ def htaccess(ip, folder, file):
unflock(fh)
fh.close()
- if folder == "metadata" or folder == "meta-data":
- entry = "RewriteRule ^meta-data/(.+)$ ../" + folder + "/%{REMOTE_ADDR}/$1 [L,NC,QSA]"
- htaccessFolder = "/var/www/html/latest"
- htaccessFile = htaccessFolder + "/.htaccess"
-
- fh = open(htaccessFile, "r+a")
- exflock(fh)
- if not entry in fh.read():
- fh.write(entry + '\n')
-
- entry = "RewriteRule ^meta-data/?$ ../" + folder + "/%{REMOTE_ADDR}/meta-data [L,NC,QSA]"
-
- fh.seek(0)
- if not entry in fh.read():
- fh.write(entry + '\n')
- unflock(fh)
- fh.close()
-
def exflock(file):
try:
flock(file, LOCK_EX)
@@ -191,7 +146,7 @@ def exflock(file):
print "failed to lock file" + file.name + " due to : " + e.strerror
sys.exit(1)
return True
-
+
def unflock(file):
try:
flock(file, LOCK_UN)
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/54e9a92d/systemvm/patches/debian/config/var/www/html/latest/.htaccess
----------------------------------------------------------------------
diff --git a/systemvm/patches/debian/config/var/www/html/latest/.htaccess b/systemvm/patches/debian/config/var/www/html/latest/.htaccess
index 038a4c9..5c9da02 100644
--- a/systemvm/patches/debian/config/var/www/html/latest/.htaccess
+++ b/systemvm/patches/debian/config/var/www/html/latest/.htaccess
@@ -1,5 +1,24 @@
-Options +FollowSymLinks
+Options +FollowSymLinks
RewriteEngine On
-#RewriteBase /
-RewriteRule ^user-data$ ../userdata/%{REMOTE_ADDR}/user-data [L,NC,QSA]
+#http://<routerIP>/latest/user-data and .../user-data/ (both yield user-data file)
+#http://<routerIP>/latest/meta-data and .../meta-data/ (dir listing of meta-data)
+RewriteRule ^user-data/?$ ../userdata/%{REMOTE_ADDR}/user-data [L,NC,QSA]
+RewriteRule ^meta-data/?$ ../metadata/%{REMOTE_ADDR}/meta-data [L,NC,QSA]
+
+#http://<routerIP/latest/meta-data/foo and .../foo/ (yield metadata/$IP/foo)
+RewriteRule ^meta-data/(.+[^/])/?$ ../metadata/%{REMOTE_ADDR}/$1 [L,NC,QSA]
+
+#http://<routerIP>/latest/foo and .../foo/ (yield metadata/$IP/foo)
+#are these used?
+RewriteRule ^availability-zone/?$ ../metadata/%{REMOTE_ADDR}/availability-zone [L,NC,QSA]
+RewriteRule ^cloud-identifier/?$ ../metadata/%{REMOTE_ADDR}/cloud-identifier [L,NC,QSA]
+RewriteRule ^instance-id/?$ ../metadata/%{REMOTE_ADDR}/instance-id [L,NC,QSA]
+RewriteRule ^local-hostname/?$ ../metadata/%{REMOTE_ADDR}/local-hostname [L,NC,QSA]
+RewriteRule ^local-ipv4/?$ ../metadata/%{REMOTE_ADDR}/local-ipv4 [L,NC,QSA]
+RewriteRule ^public-hostname/?$ ../metadata/%{REMOTE_ADDR}/public-hostname [L,NC,QSA]
+RewriteRule ^public-ipv4/?$ ../metadata/%{REMOTE_ADDR}/public-ipv4 [L,NC,QSA]
+RewriteRule ^public-keys/?$ ../metadata/%{REMOTE_ADDR}/public-keys [L,NC,QSA]
+RewriteRule ^service-offering/?$ ../metadata/%{REMOTE_ADDR}/service-offering [L,NC,QSA]
+RewriteRule ^vm-id/?$ ../metadata/%{REMOTE_ADDR}/vm-id [L,NC,QSA]
+
[2/2] git commit: updated refs/heads/4.4 to eaf3ad1
Posted by da...@apache.org.
Merge remote-tracking branch 'origin/hotfix/4.4-7405' into 4.4
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/eaf3ad1d
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/eaf3ad1d
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/eaf3ad1d
Branch: refs/heads/4.4
Commit: eaf3ad1db42b8b43df6242c6c1053c7c6ddc13dd
Parents: 7a57d78 54e9a92
Author: Daan Hoogland <da...@onecht.net>
Authored: Thu Sep 4 11:05:58 2014 +0200
Committer: Daan Hoogland <da...@onecht.net>
Committed: Thu Sep 4 11:05:58 2014 +0200
----------------------------------------------------------------------
.../VirtualRoutingResourceTest.java | 1 +
.../networkservice/BaremetalPxeManagerImpl.java | 1 +
.../element/CloudZonesNetworkElement.java | 2 +-
.../VirtualNetworkApplianceManagerImpl.java | 2 +-
.../debian/config/opt/cloud/bin/vmdata.py | 57 +++-----------------
.../debian/config/var/www/html/latest/.htaccess | 25 +++++++--
6 files changed, 32 insertions(+), 56 deletions(-)
----------------------------------------------------------------------