You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ga...@apache.org on 2013/07/09 12:10:46 UTC
git commit: updated refs/heads/4.1 to e86a9ae
Updated Branches:
refs/heads/4.1 60fe5fd92 -> e86a9ae15
[DOC]Change cloud- to cloudstack- for the service and fix script path issue
CLOUDSTACK-3179,CLOUDSTACK-3180
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/e86a9ae1
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/e86a9ae1
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/e86a9ae1
Branch: refs/heads/4.1
Commit: e86a9ae1515192a84f019aad4048e5b8e161bef0
Parents: 60fe5fd
Author: Gavin Lee <ga...@gmail.com>
Authored: Tue Jul 9 18:02:32 2013 +0800
Committer: Gavin Lee <ga...@gmail.com>
Committed: Tue Jul 9 18:02:32 2013 +0800
----------------------------------------------------------------------
docs/en-US/Release_Notes.xml | 12 ++++++------
docs/en-US/citrix-xenserver-installation.xml | 12 ++++++------
docs/en-US/first_ms_node_install.xml | 4 ++--
docs/en-US/host-add-xenserver-kvm-ovm.xml | 2 +-
docs/en-US/management-server-install-client.xml | 2 +-
docs/en-US/management-server-install-multi-node.xml | 6 ++----
docs/en-US/management-server-install-systemvm.xml | 2 +-
7 files changed, 19 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e86a9ae1/docs/en-US/Release_Notes.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/Release_Notes.xml b/docs/en-US/Release_Notes.xml
index 894d751..04e5d60 100644
--- a/docs/en-US/Release_Notes.xml
+++ b/docs/en-US/Release_Notes.xml
@@ -5299,15 +5299,15 @@ under the License.
</thead>
<tbody>
<row>
- <entry><para>/usr/lib64/cloud/common/scripts/vm/hypervisor/xenserver/xenserver60/NFSSR.py</para></entry>
+ <entry><para>/usr/share/cloudstack-common/scripts/vm/hypervisor/xenserver/xenserver60/NFSSR.py</para></entry>
<entry><para>/opt/xensource/sm/NFSSR.py</para></entry>
</row>
<row>
- <entry><para>/usr/lib64/cloud/common/scripts/vm/hypervisor/xenserver/setupxenserver.sh</para></entry>
+ <entry><para>/usr/share/cloudstack-common/scripts/vm/hypervisor/xenserver/setupxenserver.sh</para></entry>
<entry><para>/opt/xensource/bin/setupxenserver.sh</para></entry>
</row>
<row>
- <entry><para>/usr/lib64/cloud/common/scripts/vm/hypervisor/xenserver/make_migratable.sh</para></entry>
+ <entry><para>/usr/share/cloudstack-common/scripts/vm/hypervisor/xenserver/make_migratable.sh</para></entry>
<entry><para>/opt/xensource/bin/make_migratable.sh</para></entry>
</row>
</tbody>
@@ -5916,15 +5916,15 @@ under the License.
</thead>
<tbody>
<row>
- <entry><para><filename>/usr/lib64/cloud/common/scripts/vm/hypervisor/xenserver/xenserver60/NFSSR.py</filename></para></entry>
+ <entry><para><filename>/usr/share/cloudstack-common/scripts/vm/hypervisor/xenserver/xenserver60/NFSSR.py</filename></para></entry>
<entry><para><filename>/opt/xensource/sm/NFSSR.py</filename></para></entry>
</row>
<row>
- <entry><para><filename>/usr/lib64/cloud/common/scripts/vm/hypervisor/xenserver/setupxenserver.sh</filename></para></entry>
+ <entry><para><filename>/usr/share/cloudstack-common/scripts/vm/hypervisor/xenserver/setupxenserver.sh</filename></para></entry>
<entry><para><filename>/opt/xensource/bin/setupxenserver.sh</filename></para></entry>
</row>
<row>
- <entry><para><filename>/usr/lib64/cloud/common/scripts/vm/hypervisor/xenserver/make_migratable.sh</filename></para></entry>
+ <entry><para><filename>/usr/share/cloudstack-common/scripts/vm/hypervisor/xenserver/make_migratable.sh</filename></para></entry>
<entry><para><filename>/opt/xensource/bin/make_migratable.sh</filename></para></entry>
</row>
</tbody>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e86a9ae1/docs/en-US/citrix-xenserver-installation.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/citrix-xenserver-installation.xml b/docs/en-US/citrix-xenserver-installation.xml
index 6a72ed5..c1fddfa 100644
--- a/docs/en-US/citrix-xenserver-installation.xml
+++ b/docs/en-US/citrix-xenserver-installation.xml
@@ -554,7 +554,7 @@ under the License.
<orderedlist>
<listitem>
<para>Copy the script from the Management Server in
- /usr/lib64/cloud/common/scripts/vm/hypervisor/xenserver/cloud-setup-bonding.sh to the
+ /usr/share/cloudstack-common/scripts/vm/hypervisor/xenserver/cloud-setup-bonding.sh to the
master host and ensure it is executable.</para>
</listitem>
<listitem>
@@ -612,7 +612,7 @@ under the License.
<listitem>
<para>Restart the Management Server and Usage Server. You only need to do this once for
all clusters.</para>
- <programlisting language="Bash"># service cloud-management start
+ <programlisting language="Bash"># service cloudstack-management start
# service cloudstack-usage start</programlisting>
</listitem>
</orderedlist>
@@ -678,19 +678,19 @@ under the License.
</thead>
<tbody>
<row>
- <entry><para>/usr/lib64/cloud/common/scripts/vm/hypervisor/xenserver/xenserver60/NFSSR.py</para></entry>
+ <entry><para>/usr/share/cloudstack-common/scripts/vm/hypervisor/xenserver/xenserver60/NFSSR.py</para></entry>
<entry><para>/opt/xensource/sm/NFSSR.py</para></entry>
</row>
<row>
- <entry><para>/usr/lib64/cloud/common/scripts/vm/hypervisor/xenserver/setupxenserver.sh</para></entry>
+ <entry><para>/usr/share/cloudstack-common/scripts/vm/hypervisor/xenserver/setupxenserver.sh</para></entry>
<entry><para>/opt/xensource/bin/setupxenserver.sh</para></entry>
</row>
<row>
- <entry><para>/usr/lib64/cloud/common/scripts/vm/hypervisor/xenserver/make_migratable.sh</para></entry>
+ <entry><para>/usr/share/cloudstack-common/scripts/vm/hypervisor/xenserver/make_migratable.sh</para></entry>
<entry><para>/opt/xensource/bin/make_migratable.sh</para></entry>
</row>
<row>
- <entry><para>/usr/lib64/cloud/common/scripts/vm/hypervisor/xenserver/cloud-clean-vlan.sh</para></entry>
+ <entry><para>/usr/share/cloudstack-common/scripts/vm/hypervisor/xenserver/cloud-clean-vlan.sh</para></entry>
<entry><para>/opt/xensource/bin/cloud-clean-vlan.sh</para></entry>
</row>
</tbody>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e86a9ae1/docs/en-US/first_ms_node_install.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/first_ms_node_install.xml b/docs/en-US/first_ms_node_install.xml
index 3c3e51a..af6b35b 100644
--- a/docs/en-US/first_ms_node_install.xml
+++ b/docs/en-US/first_ms_node_install.xml
@@ -38,8 +38,8 @@
<para>
Install the &PRODUCT; management server packages by
issuing one of the following commands as appropriate:
- <programlisting><prompt>#</prompt> <command>yum</command> install cloud-client</programlisting>
- <programlisting><prompt>#</prompt> <command>apt-get</command> install cloud-client</programlisting>
+ <programlisting><prompt>#</prompt> <command>yum</command> install cloudstack-management</programlisting>
+ <programlisting><prompt>#</prompt> <command>apt-get</command> install cloudstack-management</programlisting>
</para>
</listitem>
<listitem>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e86a9ae1/docs/en-US/host-add-xenserver-kvm-ovm.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/host-add-xenserver-kvm-ovm.xml b/docs/en-US/host-add-xenserver-kvm-ovm.xml
index 1f13e72..175ccfd 100644
--- a/docs/en-US/host-add-xenserver-kvm-ovm.xml
+++ b/docs/en-US/host-add-xenserver-kvm-ovm.xml
@@ -62,7 +62,7 @@
<orderedlist>
<listitem>
<para>Copy the script from the Management Server in
- /usr/lib64/cloud/common/scripts/vm/hypervisor/xenserver/cloud-setup-bonding.sh to the
+ /usr/share/cloudstack-common/scripts/vm/hypervisor/xenserver/cloud-setup-bonding.sh to the
master host and ensure it is executable.</para>
</listitem>
<listitem>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e86a9ae1/docs/en-US/management-server-install-client.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/management-server-install-client.xml b/docs/en-US/management-server-install-client.xml
index 1796142..2c5ded7 100644
--- a/docs/en-US/management-server-install-client.xml
+++ b/docs/en-US/management-server-install-client.xml
@@ -48,6 +48,6 @@
<para>If the Management Server is RHEL or CentOS, copy vhd-util to
/usr/share/cloudstack-common/scripts/vm/hypervisor/xenserver.</para>
<para>If the Management Server is Ubuntu, copy vhd-util to
- /usr/lib/cloud/common/scripts/vm/hypervisor/xenserver.</para>
+ /usr/share/cloudstack-common/scripts/vm/hypervisor/xenserver.</para>
</section>
</section>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e86a9ae1/docs/en-US/management-server-install-multi-node.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/management-server-install-multi-node.xml b/docs/en-US/management-server-install-multi-node.xml
index ae925bf..480d84e 100644
--- a/docs/en-US/management-server-install-multi-node.xml
+++ b/docs/en-US/management-server-install-multi-node.xml
@@ -35,10 +35,8 @@ linkend="sect-source-buildrpm"/> or <xref linkend="sect-source-builddebs"/> as
<para>This step is required only for installations where XenServer is installed on the hypervisor hosts.</para>
<para>Download vhd-util from <ulink
url="http://download.cloud.com.s3.amazonaws.com/tools/vhd-util">vhd-util</ulink></para>
- <para>If the Management Server is RHEL or CentOS, copy vhd-util to
- /usr/lib64/cloud/common/scripts/vm/hypervisor/xenserver.</para>
- <para>If the Management Server is Ubuntu, copy vhd-util to
- /usr/lib/cloud/common/scripts/vm/hypervisor/xenserver/vhd-util.</para>
+ <para>Copy vhd-util to
+ /usr/share/cloudstack-common/scripts/vm/hypervisor/xenserver.</para>
</listitem>
<listitem>
<para> Ensure that necessary services are started and set to start on boot.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e86a9ae1/docs/en-US/management-server-install-systemvm.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/management-server-install-systemvm.xml b/docs/en-US/management-server-install-systemvm.xml
index f911ce6..214c888 100644
--- a/docs/en-US/management-server-install-systemvm.xml
+++ b/docs/en-US/management-server-install-systemvm.xml
@@ -55,7 +55,7 @@
</listitem>
</itemizedlist>
<para>On Ubuntu, use the following path instead:</para>
- <programlisting># /usr/lib/cloud/common/scripts/storage/secondary/cloud-install-sys-tmplt</programlisting>
+ <programlisting># /usr/share/cloudstack-common/scripts/storage/secondary/cloud-install-sys-tmplt</programlisting>
</listitem>
<listitem>
<para>If you are using a separate NFS server, perform this step. If you are using the