You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ch...@apache.org on 2013/04/18 18:29:15 UTC

[1/3] git commit: updated refs/heads/master to f4240e1

Updated Branches:
  refs/heads/master 34899f9b9 -> f4240e1ce


Modifying some extra tabs that cause rendering silliness in the release notes

Signed-off-by: Chip Childers <ch...@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/7023920d
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/7023920d
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/7023920d

Branch: refs/heads/master
Commit: 7023920d3459516e07ae674bf0d1eb2ebcb99b2c
Parents: 34899f9
Author: Chip Childers <ch...@apache.org>
Authored: Thu Apr 18 12:06:50 2013 -0400
Committer: Chip Childers <ch...@apache.org>
Committed: Thu Apr 18 12:28:09 2013 -0400

----------------------------------------------------------------------
 docs/en-US/Release_Notes.xml |   30 +++++++++++++++---------------
 1 files changed, 15 insertions(+), 15 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7023920d/docs/en-US/Release_Notes.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/Release_Notes.xml b/docs/en-US/Release_Notes.xml
index d51e9fb..09cf2e2 100644
--- a/docs/en-US/Release_Notes.xml
+++ b/docs/en-US/Release_Notes.xml
@@ -4181,17 +4181,17 @@ under the License.
                         <listitem>
                             <para>Restart the agent:</para>
                             <programlisting language="Bash">
-                                service cloud-agent stop
-                                killall jsvc
-                                service cloudstack-agent start
+service cloud-agent stop
+killall jsvc
+service cloudstack-agent start
                             </programlisting>
                         </listitem>
                         <listitem>
                             <para>During the upgrade, <filename>log4j-cloud.xml</filename> was simply copied over, so the logs will continue to be added to <filename>/var/log/cloud/agent/agent.log</filename>. There's nothing <emphasis>wrong</emphasis> with this, but if you prefer to be consistent, you can change this by copying over the sample configuration file:</para>
                             <programlisting language="Bash">
-                                cd /etc/cloudstack/agent
-                                mv log4j-cloud.xml.dpkg-dist log4j-cloud.xml
-                                service cloudstack-agent restart
+cd /etc/cloudstack/agent
+mv log4j-cloud.xml.dpkg-dist log4j-cloud.xml
+service cloudstack-agent restart
                             </programlisting>
                         </listitem>
                         <listitem>
@@ -4237,9 +4237,9 @@ gpgcheck=0
                         <listitem>
                             <para>Restart the agent:</para>
                             <programlisting language="Bash">
-                                service cloud-agent stop
-                                killall jsvc
-                                service cloudstack-agent start
+service cloud-agent stop
+killall jsvc
+service cloudstack-agent start
                             </programlisting>
                         </listitem>
                     </orderedlist>
@@ -4252,12 +4252,12 @@ gpgcheck=0
                     <programlisting language="Bash"><prompt>#</prompt> tail -f sysvm.log</programlisting>
                     <para>The output to <filename>sysvm.log</filename> will look something like this:</para>
                     <programlisting language="Bash">
-                        Stopping and starting 1 secondary storage vm(s)...
-                        Done stopping and starting secondary storage vm(s)
-                        Stopping and starting 1 console proxy vm(s)...
-                        Done stopping and starting console proxy vm(s).
-                        Stopping and starting 4 running routing vm(s)...
-                        Done restarting router(s).
+Stopping and starting 1 secondary storage vm(s)...
+Done stopping and starting secondary storage vm(s)
+Stopping and starting 1 console proxy vm(s)...
+Done stopping and starting console proxy vm(s).
+Stopping and starting 4 running routing vm(s)...
+Done restarting router(s).
                     </programlisting>
                 </listitem>
                 <listitem>


[3/3] git commit: updated refs/heads/master to f4240e1

Posted by ch...@apache.org.
Adding RPM and DEB upgrade steps from 3.0.2 to 4.1.0 in release notes

Signed-off-by: Chip Childers <ch...@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/f4240e1c
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/f4240e1c
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/f4240e1c

Branch: refs/heads/master
Commit: f4240e1cea58be0ea7b50c77a018d7c63e3faf15
Parents: bf12091
Author: Chip Childers <ch...@apache.org>
Authored: Thu Apr 18 12:25:26 2013 -0400
Committer: Chip Childers <ch...@apache.org>
Committed: Thu Apr 18 12:28:10 2013 -0400

----------------------------------------------------------------------
 docs/en-US/Release_Notes.xml |  114 ++++++++++++++++++++++++++++++++-----
 1 files changed, 99 insertions(+), 15 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f4240e1c/docs/en-US/Release_Notes.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/Release_Notes.xml b/docs/en-US/Release_Notes.xml
index 2810269..b07b584 100644
--- a/docs/en-US/Release_Notes.xml
+++ b/docs/en-US/Release_Notes.xml
@@ -4382,23 +4382,107 @@ Done restarting router(s).
                         the community provided yum/apt repositories to gain access to the &PRODUCT;
                         binaries.</para>
                 </listitem>
-                <listitem>
-                    <para>After you have configured an appropriate yum or apt repository, you may execute the
-                        one of the following commands as appropriate for your environment in order to upgrade
-                        &PRODUCT;: <programlisting><prompt>#</prompt> <command>yum</command> update cloud-*</programlisting>
-                        <programlisting><prompt>#</prompt> <command>apt-get</command> update
-                            <prompt>#</prompt> <command>apt-get</command> upgrade cloud-*</programlisting>
-                    </para>
-                    <para>You will, of course, have to agree to the changes suggested by Yum or APT.</para>
-                    <note>
-                        <para>If the upgrade output includes a message similar to the following, then some
-                            custom content was found in your old components.xml, and you need to merge the two
-                            files:</para>
-                        <programlisting>warning: /etc/cloud/management/components.xml created as /etc/cloud/management/components.xml.rpmnew </programlisting>
-                        <para>Instructions follow in the next step.</para>
+                <listitem id="upgrade-deb-packages-302">
+                    <para>If you are using Ubuntu, follow this procedure to upgrade your packages. If not, skip to step <xref linkend="upgrade-rpm-packages-302" />.</para> 
+                    <note><title>Community Packages</title>
+                        <para>This section assumes you're using the community supplied packages for &PRODUCT;. If you've created your own packages and APT repository, substitute your own URL for the ones used in these examples.</para>
                     </note>
+                    <orderedlist id="debsteps-302">
+                        <listitem>
+                            <para>The first order of business will be to change the sources list for each system with &PRODUCT; packages. This means all management servers, and any hosts that have the KVM agent. (No changes should be necessary for hosts that are running VMware or Xen.)</para>
+                            <para>Start by opening <filename>/etc/apt/sources.list.d/cloudstack.list</filename> on any systems that have &PRODUCT; packages installed.</para>
+                            <para>This file should have one line, which contains:</para>
+                            <programlisting language="Bash">deb http://cloudstack.apt-get.eu/ubuntu precise 4.0</programlisting>
+                            <para>We'll change it to point to the new package repository:</para>
+                            <programlisting language="Bash">deb http://cloudstack.apt-get.eu/ubuntu precise 4.1</programlisting>
+                            <para>If you're using your own package repository, change this line to read as appropriate for your 4.1.0 repository.</para>
+                        </listitem>
+                        <listitem>
+                            <para>Now update your apt package list:</para>
+                            <programlisting language="Bash">$ sudo apt-get update</programlisting>
+                        </listitem>
+                        <listitem id="deb-master-302">
+                            <para>Now that you have the repository configured, it's time to install the <filename>cloudstack-management</filename> package. This will pull in any other dependencies you need.</para>
+                            <programlisting language="Bash">$ sudo apt-get install cloudstack-management</programlisting>
+                        </listitem>
+                        <listitem id="kvm-agent-deb-302">
+                            <para>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 your <filename>agent.properties</filename>, <filename>log4j-cloud.xml</filename>, and <filename>environment.properties</filename> from <filename>/etc/cloud/agent</filename> to <filename>/etc/cloudstack/agent</filename>.</para>
+                            <para>When prompted whether you wish to keep your configuration, say Yes.</para>
+                        </listitem>
+                        <listitem>
+                            <para>Verify that the file <filename>/etc/cloudstack/agent/environment.properties</filename> has a line that reads:</para>
+                            <programlisting language="Bash">paths.script=/usr/share/cloudstack-common</programlisting>
+                            <para>If not, add the line.</para>
+                        </listitem>
+                        <listitem>
+                            <para>Restart the agent:</para>
+                            <programlisting language="Bash">
+service cloud-agent stop
+killall jsvc
+service cloudstack-agent start
+                            </programlisting>
+                        </listitem>
+                        <listitem>
+                            <para>During the upgrade, <filename>log4j-cloud.xml</filename> was simply copied over, so the logs will continue to be added to <filename>/var/log/cloud/agent/agent.log</filename>. There's nothing <emphasis>wrong</emphasis> with this, but if you prefer to be consistent, you can change this by copying over the sample configuration file:</para>
+                            <programlisting language="Bash">
+cd /etc/cloudstack/agent
+mv log4j-cloud.xml.dpkg-dist log4j-cloud.xml
+service cloudstack-agent restart
+                            </programlisting>
+                        </listitem>
+                        <listitem>
+                            <para>Once the agent is running, you can uninstall the old cloud-* packages from your system:</para>
+                            <programlisting language="Bash">sudo dpkg --purge cloud-agent</programlisting>
+                        </listitem> 
+                    </orderedlist>
                 </listitem>
-                <listitem>
+                <listitem id="upgrade-rpm-packages-302">
+                    <para>If you are using CentOS or RHEL, follow this procedure to upgrade your packages. If not, skip to step <xref linkend="correct-components-xml-302" />.</para> 
+                    <note><title>Community Packages</title>
+                        <para>This section assumes you're using the community supplied packages for &PRODUCT;. If you've created your own packages and yum repository, substitute your own URL for the ones used in these examples.</para>
+                    </note>
+                    <orderedlist id="rpmsteps-302">
+                        <listitem>
+                            <para>The first order of business will be to change the yum repository for each system with &PRODUCT; packages. This means all management servers, and any hosts that have the KVM agent. (No changes should be necessary for hosts that are running VMware or Xen.)</para>
+                            <para>Start by opening <filename>/etc/yum.repos.d/cloudstack.repo</filename> on any systems that have &PRODUCT; packages installed.</para>
+                            <para>This file should have content similar to the following:</para>
+                            <programlisting language="Bash">
+[apache-cloudstack]
+name=Apache CloudStack
+baseurl=http://cloudstack.apt-get.eu/rhel/4.0/
+enabled=1
+gpgcheck=0
+                            </programlisting>
+                            <para>If you are using the community provided package repository, change the baseurl to http://cloudstack.apt-get.eu/rhel/4.1/</para>
+                            <para>If you're using your own package repository, change this line to read as appropriate for your 4.1.0 repository.</para>
+                        </listitem>
+                        <listitem id="rpm-master-302">
+                            <para>Now that you have the repository configured, it's time to install the <filename>cloudstack-management</filename> package. This will pull in any other dependencies you need.</para>
+                            <programlisting language="Bash">$ sudo yum install cloudstack-management</programlisting>
+                        </listitem>
+                        <listitem id="kvm-agent-rpm-302">
+                            <para>For KVM hosts, you will need to upgrade the <filename>cloudstack-agent</filename> package:</para>
+                            <programlisting language="Bash">$ sudo yum install cloudstack-agent</programlisting>
+                            <para>During the installation of <filename>cloudstack-agent</filename>, the RPM will copy your <filename>agent.properties</filename>, <filename>log4j-cloud.xml</filename>, and <filename>environment.properties</filename> from <filename>/etc/cloud/agent</filename> to <filename>/etc/cloudstack/agent</filename>.</para>
+                        </listitem>
+                        <listitem>
+                            <para>Verify that the file <filename>/etc/cloudstack/agent/environment.properties</filename> has a line that reads:</para>
+                            <programlisting language="Bash">paths.script=/usr/share/cloudstack-common</programlisting>
+                            <para>If not, add the line.</para>
+                        </listitem>
+                        <listitem>
+                            <para>Restart the agent:</para>
+                            <programlisting language="Bash">
+service cloud-agent stop
+killall jsvc
+service cloudstack-agent start
+                            </programlisting>
+                        </listitem>
+                    </orderedlist>
+                </listitem>
+                <listitem id="correct-components-xml-302">
                     <para>If you have made changes to your copy of
                         <filename>/etc/cloud/management/components.xml</filename> the changes will be
                         preserved in the upgrade. However, you need to do the following steps to place these


[2/3] git commit: updated refs/heads/master to f4240e1

Posted by ch...@apache.org.
Removing inappropriate note about an upgrade *to* 3.0.2 in the *from* 3.0.2 section of the release notes

Signed-off-by: Chip Childers <ch...@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/bf120917
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/bf120917
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/bf120917

Branch: refs/heads/master
Commit: bf120917f99df0e3d03d50f619ea5809f4c914c4
Parents: 7023920
Author: Chip Childers <ch...@apache.org>
Authored: Thu Apr 18 12:12:02 2013 -0400
Committer: Chip Childers <ch...@apache.org>
Committed: Thu Apr 18 12:28:10 2013 -0400

----------------------------------------------------------------------
 docs/en-US/Release_Notes.xml |    9 ---------
 1 files changed, 0 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bf120917/docs/en-US/Release_Notes.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/Release_Notes.xml b/docs/en-US/Release_Notes.xml
index 09cf2e2..2810269 100644
--- a/docs/en-US/Release_Notes.xml
+++ b/docs/en-US/Release_Notes.xml
@@ -4273,15 +4273,6 @@ Done restarting router(s).
             <para>This section will guide you from Citrix CloudStack 3.0.2 to Apache CloudStack 4.1.0. Sections that are hypervisor-specific will be called out with a note.</para>
             <orderedlist>
                 <listitem>
-                    <para>Ensure that you query your IP address usage records and process them or make a
-                        backup. During the upgrade you will lose the old IP address usage records.</para>
-                    <para>Starting in 3.0.2, the usage record format for IP addresses is the same as the rest
-                        of the usage types. Instead of a single record with the assignment and release dates,
-                        separate records are generated per aggregation period with start and end dates. After
-                        upgrading, any existing IP address usage records in the old format will no longer be
-                        available.</para>
-                </listitem>
-                <listitem>
                     <note>
                         <para>The following upgrade instructions apply only if you're using VMware hosts. If
                             you're not using VMware hosts, skip this step and move on to <xref linkend="stopping-usage-servers" />.</para>