etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into ui-vm-affinity

This commit is contained in:
Brian Federle 2013-04-15 14:07:19 -07:00
parent bd8a9e920e 4cc1097aa5
commit 1069610174
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docs/en-US/ipv6-support.xml
View File

@ -75,8 +75,8 @@
</listitem>
<listitem>
<para>Use the System VM template exclusively designed to support IPv6. Download the System
VM template from <ulink url="http://nfs1.lab.vmops.com/templates/routing/debian/ipv6/"
>http://nfs1.lab.vmops.com/templates/routing/debian/ipv6/</ulink>.</para>
VM template from <ulink url="http://cloudstack.apt-get.eu/systemvm/"
>http://cloudstack.apt-get.eu/systemvm/</ulink>.</para>
</listitem>
<listitem>
<para>The concept of Default Network applies to IPv6 networks. However, unlike IPv4

3
server/src/com/cloud/server/ConfigurationServerImpl.java
View File

@ -729,7 +729,8 @@ public class ConfigurationServerImpl extends ManagerBase implements Configuratio
if (systemVmIsoPath == null) {
throw new CloudRuntimeException("Unable to find systemvm iso vms/systemvm.iso");
}
final Script command = new Script("/bin/bash " + scriptPath, s_logger);
final Script command = new Script("/bin/bash", s_logger);
command.add(scriptPath);
command.add(publicKeyPath);
command.add(privKeyPath);
command.add(systemVmIsoPath);