mirror of
https://github.com/apache/cloudstack.git
synced 2025-11-02 20:02:29 +01:00
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cloudstack
This commit is contained in:
Sebastien Goasguen
commit
1a50e2fddc
@ -4641,11 +4641,6 @@ under the License.
|
||||
You'll be prompted for your password.</para>
|
||||
<programlisting><prompt>#</prompt> mysqldump -u root -p cloud > cloudstack-backup.sql</programlisting>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>Whether you're upgrading a Red Hat/CentOS based system or Ubuntu based system,
|
||||
you're going to need to stop the CloudStack management server before proceeding.</para>
|
||||
<programlisting language="Bash"><prompt>#</prompt> service cloud-management stop</programlisting>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>If you have made changes to
|
||||
<filename>/etc/cloud/management/components.xml</filename>, you'll need to carry these
|
||||
@ -5598,7 +5593,7 @@ service cloudstack-agent start
|
||||
<programlisting language="Bash">$ sudo apt-get install cloudstack-management</programlisting>
|
||||
</listitem>
|
||||
<listitem id="kvm-agent-deb-22">
|
||||
<para>You will need to manually install the <filename>cloudstack-agent</filename>
|
||||
<para>On KVM hosts, you will need to manually install the <filename>cloudstack-agent</filename>
|
||||
package:</para>
|
||||
<programlisting language="Bash">$ sudo apt-get install cloudstack-agent</programlisting>
|
||||
<para>During the installation of <filename>cloudstack-agent</filename>, APT will copy
|
||||
@ -5621,7 +5616,7 @@ service cloudstack-agent start
|
||||
service cloud-agent stop
|
||||
killall jsvc
|
||||
service cloudstack-agent start
|
||||
</programlisting>
|
||||
</programlisting>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>During the upgrade, <filename>log4j-cloud.xml</filename> was simply copied over,
|
||||
|
||||
@ -60,6 +60,6 @@
|
||||
over a known port.</para>
|
||||
<para>The encryption type, database secret key, and Management Server secret key are set during
|
||||
&PRODUCT; installation. They are all parameters to the &PRODUCT; database setup script
|
||||
(cloud-setup-databases). The default values are file, password, and password. It is, of course,
|
||||
(cloudstack-setup-databases). The default values are file, password, and password. It is, of course,
|
||||
highly recommended that you change these to more secure keys.</para>
|
||||
</section>
|
||||
|
||||
@ -103,7 +103,10 @@
|
||||
>https://www.citrix.com/English/ss/downloads/</ulink>, download the appropriate version
|
||||
of XenServer for your &PRODUCT; version (see <xref
|
||||
linkend="system-requirements-xenserver-hosts"/>). Install it using the Citrix XenServer
|
||||
Installation Guide.</para>
|
||||
Installation Guide.</para>
|
||||
<note><title>Older Versions of XenServer</title>
|
||||
<para>Note that you can download the most recent release of XenServer without having a Citrix account. If you wish to download older versions, you will need to create an account and look through the download archives.</para>
|
||||
</note>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>After installation, perform the following configuration steps, which are described in
|
||||
|
||||
@ -37,10 +37,14 @@ server_id=1
|
||||
<para>The server_id must be unique with respect to other servers. The recommended way to achieve this is to give the master an ID of 1 and each slave a sequential number greater than 1, so that the servers are numbered 1, 2, 3, etc.</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>Restart the MySQL service:</para>
|
||||
<para>Restart the MySQL service. On RHEL/CentOS systems, use:</para>
|
||||
<programlisting>
|
||||
# service mysqld restart
|
||||
</programlisting>
|
||||
<para>On Debian/Ubuntu systems, use:</para>
|
||||
<programlisting>
|
||||
# service mysql restart
|
||||
</programlisting>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>Create a replication account on the master and give it privileges. We will use the "cloud-repl" user with the password "password". This assumes that master and slave run on the 172.16.1.0/24 network.</para>
|
||||
@ -90,10 +94,14 @@ innodb_lock_wait_timeout=600
|
||||
</programlisting>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>Restart MySQL.</para>
|
||||
<para>Restart MySQL. Use "mysqld" on RHEL/CentOS systems:</para>
|
||||
<programlisting>
|
||||
# service mysqld restart
|
||||
</programlisting>
|
||||
<para>On Ubuntu/Debian systems use "mysql."</para>
|
||||
<programlisting>
|
||||
# service mysql restart
|
||||
</programlisting>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>Instruct the slave to connect to and replicate from the master. Replace the IP address, password, log file, and position with the values you have used in the previous steps.</para>
|
||||
|
||||
@ -132,7 +132,7 @@ bind-address = 0.0.0.0</programlisting>
|
||||
server node IP. If not specified, the local IP address will be used.</para>
|
||||
</listitem>
|
||||
</itemizedlist>
|
||||
<programlisting language="Bash">cloud-setup-databases cloud:<dbpassword>@<ip address mysql server> \
|
||||
<programlisting language="Bash">cloudstack-setup-databases cloud:<dbpassword>@<ip address mysql server> \
|
||||
--deploy-as=root:<password> \
|
||||
-e <encryption_type> \
|
||||
-m <management_server_key> \
|
||||
|
||||
@ -135,7 +135,7 @@ binlog-format = 'ROW'</programlisting>
|
||||
server node IP. If not specified, the local IP address will be used.</para>
|
||||
</listitem>
|
||||
</itemizedlist>
|
||||
<programlisting language="Bash">cloud-setup-databases cloud:<dbpassword>@localhost \
|
||||
<programlisting language="Bash">cloudstack-setup-databases cloud:<dbpassword>@localhost \
|
||||
--deploy-as=root:<password> \
|
||||
-e <encryption_type> \
|
||||
-m <management_server_key> \
|
||||
@ -160,7 +160,7 @@ binlog-format = 'ROW'</programlisting>
|
||||
<listitem>
|
||||
<para>Now that the database is set up, you can finish configuring the OS for the Management
|
||||
Server. This command will set up iptables, sudoers, and start the Management Server.</para>
|
||||
<programlisting><prompt>#</prompt> cloud-setup-management</programlisting>
|
||||
<programlisting><prompt>#</prompt> cloudstack-setup-management</programlisting>
|
||||
<para>You should see the message “&PRODUCT; Management Server setup is done.”</para>
|
||||
</listitem>
|
||||
</orderedlist>
|
||||
|
||||
@ -53,12 +53,12 @@ linkend="sect-source-buildrpm"/> or <xref linkend="sect-source-builddebs"/> as
|
||||
<para>Configure the database client. Note the absence of the --deploy-as argument in this
|
||||
case. (For more details about the arguments to this command, see <xref
|
||||
linkend="management-server-install-db-external"/>.) </para>
|
||||
<programlisting><prompt>#</prompt> cloud-setup-databases cloud:<replaceable>dbpassword</replaceable>@<replaceable>dbhost</replaceable> -e <replaceable>encryption_type</replaceable> -m <replaceable>management_server_key</replaceable> -k <replaceable>database_key</replaceable> -i <replaceable>management_server_ip</replaceable>
|
||||
<programlisting><prompt>#</prompt> cloudstack-setup-databases cloud:<replaceable>dbpassword</replaceable>@<replaceable>dbhost</replaceable> -e <replaceable>encryption_type</replaceable> -m <replaceable>management_server_key</replaceable> -k <replaceable>database_key</replaceable> -i <replaceable>management_server_ip</replaceable>
|
||||
</programlisting>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>Configure the OS and start the Management Server:</para>
|
||||
<programlisting><prompt>#</prompt> cloud-setup-management</programlisting>
|
||||
<programlisting><prompt>#</prompt> cloudstack-setup-management</programlisting>
|
||||
<para>The Management Server on this node should now be running.</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
|
||||
@ -45,7 +45,7 @@
|
||||
the additional command-line flag <code>-r <region_id></code> to set a
|
||||
region ID for the new region. The default region is automatically assigned a
|
||||
region ID of 1, so your first additional region might be region 2.</para>
|
||||
<programlisting>cloud-setup-databases cloud:<dbpassword>@localhost --deploy-as=root:<password> -e <encryption_type> -m <management_server_key> -k <database_key> -r <region_id></programlisting>
|
||||
<programlisting>cloudstack-setup-databases cloud:<dbpassword>@localhost --deploy-as=root:<password> -e <encryption_type> -m <management_server_key> -k <database_key> -r <region_id></programlisting>
|
||||
</listitem>
|
||||
<listitem><para>By the end of the installation procedure, the Management Server should have been started. Be sure that the Management Server installation was successful and complete.</para></listitem>
|
||||
<listitem><para>Add region 2 to region 1. Use the API command addRegion. (For information about how to make an API call, see the Developer's Guide.)</para>
|
||||
@ -82,7 +82,7 @@
|
||||
However, you must repeat certain steps additional times for each additional region:</para>
|
||||
<orderedlist>
|
||||
<listitem><para>Install &PRODUCT; in each additional region. Set the region ID for each region during the database setup step.</para>
|
||||
<programlisting>cloud-setup-databases cloud:<dbpassword>@localhost --deploy-as=root:<password> -e <encryption_type> -m <management_server_key> -k <database_key> -r <region_id></programlisting></listitem>
|
||||
<programlisting>cloudstack-setup-databases cloud:<dbpassword>@localhost --deploy-as=root:<password> -e <encryption_type> -m <management_server_key> -k <database_key> -r <region_id></programlisting></listitem>
|
||||
<listitem><para>Once the Management Server is running, add your new region to all existing regions by
|
||||
repeatedly calling the API command addRegion. For example, if you were adding
|
||||
region 3:</para>
|
||||
@ -125,4 +125,4 @@ http://<IP_of_region_3_Management_Server>:8080/client/api?command=addRegio
|
||||
|
||||
http://<IP_of_region_2_Management_Server>:8080/client/api?command=removeRegion&id=3&apiKey=miVr6X7u6bN_sdahOBpjNejPgEsT35eXq-jB8CG20YI3yaxXcgpyuaIRmFI_EJTVwZ0nUkkJbPmY3y2bciKwFQ&signature=Lxx1DM40AjcXU%2FcaiK8RAP0O1hU%3D</programlisting>
|
||||
</section>
|
||||
</section>
|
||||
</section>
|
||||
|
||||
@ -50,8 +50,8 @@ baseimage() {
|
||||
|
||||
mount -o loop,offset=$offset $IMAGELOC $MOUNTPOINT
|
||||
|
||||
#debootstrap --variant=minbase --keyring=/usr/share/keyrings/debian-archive-keyring.gpg squeeze $MOUNTPOINT http://${APT_PROXY}${DEBIAN_MIRROR}
|
||||
debootstrap --variant=minbase --arch=i386 squeeze $MOUNTPOINT http://${APT_PROXY}${DEBIAN_MIRROR}
|
||||
#debootstrap --variant=minbase --keyring=/usr/share/keyrings/debian-archive-keyring.gpg wheezy $MOUNTPOINT http://${APT_PROXY}${DEBIAN_MIRROR}
|
||||
debootstrap --variant=minbase --arch=i386 wheezy $MOUNTPOINT http://${APT_PROXY}${DEBIAN_MIRROR}
|
||||
}
|
||||
|
||||
|
||||
@ -63,11 +63,14 @@ EOF
|
||||
fi
|
||||
|
||||
cat > etc/apt/sources.list << EOF
|
||||
deb http://ftp.us.debian.org/debian/ squeeze main contrib non-free
|
||||
deb-src http://ftp.us.debian.org/debian/ squeeze main contrib non-free
|
||||
deb http://ftp.us.debian.org/debian/ wheezy main contrib non-free
|
||||
deb-src http://ftp.us.debian.org/debian/ wheezy main contrib non-free
|
||||
|
||||
deb http://security.debian.org/ squeeze/updates main
|
||||
deb-src http://security.debian.org/ squeeze/updates main
|
||||
deb http://security.debian.org/ wheezy/updates main
|
||||
deb-src http://security.debian.org/ wheezy/updates main
|
||||
|
||||
deb http://ftp.us.debian.org/debian/ wheezy-backports main
|
||||
deb-src http://ftp.us.debian.org/debian/ wheezy-backports main
|
||||
EOF
|
||||
|
||||
cat >> etc/apt/apt.conf << EOF
|
||||
@ -347,7 +350,7 @@ packages() {
|
||||
export DEBIAN_FRONTEND DEBIAN_PRIORITY DEBCONF_DB_OVERRIDE
|
||||
|
||||
#basic stuff
|
||||
chroot . apt-get --no-install-recommends -q -y --force-yes install rsyslog logrotate cron chkconfig insserv net-tools ifupdown vim-tiny netbase iptables openssh-server grub-legacy e2fsprogs dhcp3-client dnsmasq tcpdump socat wget python bzip2 sed gawk diff grep gzip less tar telnet ftp rsync traceroute psmisc lsof procps monit inetutils-ping iputils-arping httping dnsutils zip unzip ethtool uuid file iproute acpid iptables-persistent virt-what sudo
|
||||
chroot . apt-get --no-install-recommends -q -y --force-yes install rsyslog logrotate cron chkconfig insserv net-tools ifupdown vim-tiny netbase iptables openssh-server grub-legacy e2fsprogs dhcp3-client dnsmasq tcpdump socat wget python bzip2 sed gawk diffutils grep gzip less tar telnet ftp rsync traceroute psmisc lsof procps monit inetutils-ping iputils-arping httping dnsutils zip unzip ethtool uuid file iproute acpid iptables-persistent virt-what sudo
|
||||
#fix hostname in openssh-server generated keys
|
||||
sed -i "s/root@\(.*\)$/root@systemvm/g" etc/ssh/ssh_host_*.pub
|
||||
|
||||
@ -373,14 +376,8 @@ packages() {
|
||||
#ipcalc
|
||||
chroot . apt-get --no-install-recommends -q -y --force-yes install ipcalc
|
||||
|
||||
echo "***** getting sun jre 6*********"
|
||||
chroot . echo 'sun-java6-bin shared/accepted-sun-dlj-v1-1 boolean true
|
||||
sun-java6-jre shared/accepted-sun-dlj-v1-1 boolean true
|
||||
sun-java6-jre sun-java6-jre/stopthread boolean true
|
||||
sun-java6-jre sun-java6-jre/jcepolicy note
|
||||
sun-java6-bin shared/present-sun-dlj-v1-1 note
|
||||
sun-java6-jre shared/present-sun-dlj-v1-1 note ' | chroot . debconf-set-selections
|
||||
chroot . apt-get --no-install-recommends -q -y install sun-java6-jre
|
||||
echo "***** getting jre 7 *********"
|
||||
chroot . apt-get --no-install-recommends -q -y install openjdk-7-jre-headless
|
||||
}
|
||||
|
||||
|
||||
@ -409,7 +406,9 @@ services() {
|
||||
chroot . chkconfig xl2tpd off
|
||||
chroot . chkconfig --add cloud-early-config
|
||||
chroot . chkconfig cloud-early-config on
|
||||
chroot . chkconfig --add cloud-passwd-srvr
|
||||
chroot . chkconfig --add iptables-persistent
|
||||
chroot . chkconfig iptables-persistent off
|
||||
chroot . chkconfig --force --add cloud-passwd-srvr
|
||||
chroot . chkconfig cloud-passwd-srvr off
|
||||
chroot . chkconfig --add cloud
|
||||
chroot . chkconfig cloud off
|
||||
@ -477,9 +476,9 @@ scriptdir=$(dirname $PWD/$0)
|
||||
|
||||
rm -rf /tmp/systemvm
|
||||
mkdir -p /tmp/systemvm
|
||||
cp ./xt_CHECKSUM.ko /tmp/systemvm
|
||||
cp ./iptables_1.4.8-3local1checksum1_i386.deb /tmp/systemvm
|
||||
cp ./xe-guest-utilities_5.6.0-595_i386.deb /tmp/systemvm
|
||||
#cp ./xt_CHECKSUM.ko /tmp/systemvm
|
||||
#cp ./iptables_1.4.8-3local1checksum1_i386.deb /tmp/systemvm
|
||||
#cp ./xe-guest-utilities_5.6.0-595_i386.deb /tmp/systemvm
|
||||
|
||||
rm -f $IMAGELOC
|
||||
begin=$(date +%s)
|
||||
|
||||
@ -112,6 +112,9 @@ get_boot_params() {
|
||||
sed -i "s/%/ /g" /var/cache/cloud/cmdline
|
||||
;;
|
||||
kvm)
|
||||
if [ ! -e /dev/vport0p1 ]; then
|
||||
log_it "/dev/vport0p1 not loaded, perhaps guest kernel is too old." && exit 2
|
||||
fi
|
||||
while read line; do
|
||||
if [[ $line == cmdline:* ]]; then
|
||||
cmd=${line//cmdline:/}
|
||||
@ -133,7 +136,7 @@ get_boot_params() {
|
||||
mount -t ntfs /dev/sdb1 $EXTRA_MOUNT
|
||||
cp -f $EXTRA_MOUNT/cmdline /var/cache/cloud/cmdline
|
||||
umount $EXTRA_MOUNT
|
||||
;;
|
||||
;;
|
||||
esac
|
||||
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user