Merge branch '4.13'

Author: andrijapanicsb

source/quickinstallationguide/qig.rst

@@ -494,7 +494,7 @@ the system VMs images.
   
    /usr/share/cloudstack-common/scripts/storage/secondary/cloud-install-sys-tmplt \
    -m /export/secondary \
-   -u http://download.cloudstack.org/systemvm/4.11/systemvmtemplate-4.11.2-kvm.qcow2.bz2 \
+   -u |sysvm64-url-kvm| \
    -h kvm -F
 
 

source/upgrading/upgrade/upgrade-4.11.rst

@@ -286,15 +286,6 @@ hosts.
 
       $ sudo apt-get upgrade cloudstack-agent
 
-#. Verify that the file ``/etc/cloudstack/agent/environment.properties`` has a
-    line that reads:
-
-   .. parsed-literal::
-
-      paths.script=/usr/share/cloudstack-common
-
-   If not, add the line.
-
 #. Start the agent.
 
    .. parsed-literal::
@@ -313,15 +304,6 @@ For KVM hosts, upgrade the ``cloudstack-agent`` package
 
       $ sudo yum upgrade cloudstack-agent
 
-#. Verify that the file ``/etc/cloudstack/agent/environment.properties`` has a
-   line that reads:
-
-   .. parsed-literal::
-
-      paths.script=/usr/share/cloudstack-common
-
-   If not, add the line.
-
 #. Restart the agent:
 
    .. parsed-literal::

source/upgrading/upgrade/upgrade-4.12.rst

@@ -287,15 +287,6 @@ hosts.
 
       $ sudo apt-get upgrade cloudstack-agent
 
-#. Verify that the file ``/etc/cloudstack/agent/environment.properties`` has a
-   line that reads:
-
-   .. parsed-literal::
-
-      paths.script=/usr/share/cloudstack-common
-
-   If not, add the line.
-
 #. Start the agent.
 
    .. parsed-literal::
@@ -314,15 +305,6 @@ For KVM hosts, upgrade the ``cloudstack-agent`` package
 
       $ sudo yum upgrade cloudstack-agent
 
-#. Verify that the file ``/etc/cloudstack/agent/environment.properties`` has a
-   line that reads:
-
-   .. parsed-literal::
-
-      paths.script=/usr/share/cloudstack-common
-
-   If not, add the line.
-
 #. Restart the agent:
 
    .. parsed-literal::

source/upgrading/upgrade/upgrade-4.13.rst

@@ -265,15 +265,6 @@ hosts.
 
       $ sudo apt-get upgrade cloudstack-agent
 
-#. Verify that the file ``/etc/cloudstack/agent/environment.properties`` has a
-   line that reads:
-
-   .. parsed-literal::
-
-      paths.script=/usr/share/cloudstack-common
-
-   If not, add the line.
-
 #. Start the agent.
 
    .. parsed-literal::
@@ -292,15 +283,6 @@ For KVM hosts, upgrade the ``cloudstack-agent`` package
 
       $ sudo yum upgrade cloudstack-agent
 
-#. Verify that the file ``/etc/cloudstack/agent/environment.properties`` has a
-   line that reads:
-
-   .. parsed-literal::
-
-      paths.script=/usr/share/cloudstack-common
-
-   If not, add the line.
-
 #. Restart the agent:
 
    .. parsed-literal::