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

Merge branch '4.2' of https://git-wip-us.apache.org/repos/asf/cloudstack into 4.2

This commit is contained in:
Sateesh Chodapuneedi 2013-08-19 05:54:01 +05:30
parent dd5ea8f2aa 8babd390d6
commit e280d24d18
3 changed files with 56 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
docs/en-US/linux-installation.xml
View File

@ -22,32 +22,49 @@
under the License.
-->
<section id="linux-installation">
<title>Linux OS Installation</title>
<para>Use the following steps to begin the Linux OS installation:</para>
<orderedlist>
<listitem><para>Download the script file cloud-set-guest-password:</para>
<itemizedlist>
<listitem><para>Linux: <ulink url="
http://cloudstack.org/dl/cloud-set-guest-password
"></ulink>
</para></listitem>
<listitem><para>Windows: <ulink url="
http://sourceforge.net/projects/cloudstack/files/Password%20Management%20Scripts/CloudInstanceManager.msi/download
"></ulink>
</para></listitem>
</itemizedlist>
</listitem>
<listitem><para>Copy this file to /etc/init.d.</para><para>On some Linux distributions, copy the file to /etc/rc.d/init.d.</para>
</listitem>
<listitem><para>Run the following command to make the script executable:</para><programlisting>chmod +x /etc/init.d/cloud-set-guest-password</programlisting>
</listitem>
<listitem><para>Depending on the Linux distribution, continue with the appropriate step.</para><para>On Fedora, CentOS/RHEL, and Debian, run:</para><programlisting>chkconfig --add cloud-set-guest-password</programlisting>
<para condition="community">On Ubuntu with VMware tools, link the script file to the /etc/network/if-up and
/etc/network/if-down folders, and run the script:</para>
<programlisting condition="community">#ln -s /etc/init.d/cloud-set-guest-password /etc/network/if-up/cloud-set-guest-password
<title>Linux OS Installation</title>
<para>Use the following steps to begin the Linux OS installation:</para>
<orderedlist>
<listitem>
<para>Download the script file cloud-set-guest-password:</para>
<itemizedlist>
<listitem>
<para>Linux: <ulink
url="http://download.cloud.com/templates/4.2/bindir/cloud-set-guest-password.in"/>
</para>
</listitem>
<listitem>
<para>Windows: <ulink
url="http://sourceforge.net/projects/cloudstack/files/Password%20Management%20Scripts/CloudInstanceManager.msi/download"
/>
</para>
</listitem>
</itemizedlist>
</listitem>
<listitem>
<para>Copy this file to /etc/init.d.</para>
<para>On some Linux distributions, copy the file to
<filename>/etc/rc.d/init.d</filename>.</para>
</listitem>
<listitem>
<para>Run the following command to make the script executable:</para>
<programlisting>chmod +x /etc/init.d/cloud-set-guest-password</programlisting>
</listitem>
<listitem>
<para>Depending on the Linux distribution, continue with the appropriate step.</para>
<para>On Fedora, CentOS/RHEL, and Debian, run:</para>
<programlisting>chkconfig --add cloud-set-guest-password</programlisting>
<para condition="community">On Ubuntu with VMware tools, link the script file to the
<filename>/etc/network/if-up</filename> and <filename>/etc/network/if-down</filename>
folders, and run the script:</para>
<programlisting condition="community">#ln -s /etc/init.d/cloud-set-guest-password /etc/network/if-up/cloud-set-guest-password
#ln -s /etc/init.d/cloud-set-guest-password /etc/network/if-down/cloud-set-guest-password</programlisting>
<para condition="community">If you are using Ubuntu 11.04, start by creating a directory called /var/lib/dhcp3 on your Ubuntu machine (works around a known issue with this version of Ubuntu). On all Ubuntu versions: Run “sudo update-rc.d cloud-set-guest-password defaults 98”. To test, run "mkpasswd" and check that it is generating a new password. If the “mkpasswd” command does not exist, run "sudo apt-get install whois" (or sudo apt-get install mkpasswd, depending on your Ubuntu version) and repeat.</para>
</listitem>
</orderedlist>
</section>
<para condition="community">If you are using Ubuntu 11.04, start by creating a directory
called /var/lib/dhcp3 on your Ubuntu machine (works around a known issue with this version
of Ubuntu). On all Ubuntu versions: Run “sudo update-rc.d cloud-set-guest-password defaults
98”. To test, run "mkpasswd" and check that it is generating a new password. If the
“mkpasswd” command does not exist, run "sudo apt-get install whois" (or sudo apt-get install
mkpasswd, depending on your Ubuntu version) and repeat.</para>
</listitem>
</orderedlist>
</section>

9
patches/systemvm/debian/config/etc/init.d/cloud-early-config
View File

@ -724,6 +724,15 @@ setup_dnsmasq() {
then
echo "$ETH0_IP6 data-server" >> /etc/hosts
fi
#add the dhcp-client-update only if dnsmasq version is 2.6 and above
dnsmasqVersion=$(dnsmasq -v | grep version -m 1 | grep -o "[[:digit:]]\.[[:digit:]]")
major=$(echo "$dnsmasqVersion" | cut -d '.' -f 1)
minor=$(echo "$dnsmasqVersion" | cut -d '.' -f 2)
if [ "$major" -eq '2' -a "$minor" -ge '6' ] || [ "$major" -gt '2' ]
then
sed -i -e "/^dhcp-client-update/d" /etc/dnsmasq.conf
echo 'dhcp-client-update' >> /etc/dnsmasq.conf
fi
}
setup_sshd(){

2
plugins/hypervisors/simulator/src/com/cloud/agent/manager/SimulatorManagerImpl.java
View File

@ -427,6 +427,8 @@ public class SimulatorManagerImpl extends ManagerBase implements SimulatorManage
throw new CloudRuntimeException("Unable to configure simulator because of " + ex.getMessage(), ex);
} finally {
txn.close();
txn = Transaction.open(Transaction.CLOUD_DB);
txn.close();
}
return true;
}