Updating ISO links

conf.py

@@ -55,8 +55,8 @@
 # The full version, including alpha/beta/rc tags.
 release = '4.0rc1'
 # The date the ISOs were built
-iso_netinstall_build_date = '2016Mar03'
-iso_fullinstall_build_date = '2016Jun16'
+iso_netinstall_build_date = '2016Oct05'
+iso_fullinstall_build_date = '2016Oct05'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -283,8 +283,8 @@
 ###perfSONAR Specific settings
 
 #URL to download server
-ps_download_url = 'http://downloads.perfsonar.net/toolkit'
-#ps_download_url = 'http://downloads.perfsonar.net/toolkit/release_candidates/%s' % release
+#ps_download_url = 'http://downloads.perfsonar.net/toolkit'
+ps_download_url = 'http://downloads.perfsonar.net/toolkit/release_candidates'
 #CentOS version
 centos_version = '7'
 
@@ -300,8 +300,8 @@
 #   :centos_netinstall_iso:`toolkit iso <x86_64>`
 extlinks = {
     'centos': ("http://www.centos.org", 'CentOS %s' % centos_version),
-    'centos_netinstall_iso': ("%s/pS-Toolkit-%s-NetInstall-%s-%s.iso" % (ps_download_url, release, '%s', iso_netinstall_build_date), ''),
-    'centos_netinstall_md5': ("%s/pS-Toolkit-%s-NetInstall-%s-%s.iso.md5" % (ps_download_url, release, '%s', iso_netinstall_build_date), ''),
-    'centos_fullinstall_iso': ("%s/pS-Toolkit-%s-FullInstall-%s-%s.iso" % (ps_download_url, release, '%s', iso_fullinstall_build_date), ''),
-    'centos_fullinstall_md5': ("%s/pS-Toolkit-%s-FullInstall-%s-%s.iso.md5" % (ps_download_url, release, '%s', iso_fullinstall_build_date), '')
+    'centos_netinstall_iso': ("%s/pS-Toolkit-%s-CentOS%s-NetInstall-%s-%s.iso" % (ps_download_url, release, centos_version, '%s', iso_netinstall_build_date), ''),
+    'centos_netinstall_md5': ("%s/pS-Toolkit-%s-CentOS%s-NetInstall-%s-%s.iso.md5" % (ps_download_url, release, centos_version, '%s', iso_netinstall_build_date), ''),
+    'centos_fullinstall_iso': ("%s/pS-Toolkit-%s-CentOS%s-FullInstall-%s-%s.iso" % (ps_download_url, release, centos_version,'%s', iso_fullinstall_build_date), ''),
+    'centos_fullinstall_md5': ("%s/pS-Toolkit-%s-CentOS%s-FullInstall-%s-%s.iso.md5" % (ps_download_url, release, centos_version, '%s', iso_fullinstall_build_date), '')
 }

install_centos_fullinstall.rst

@@ -9,20 +9,18 @@ The CentOS Full Install distribution of the perfSONAR toolkit is an ISO image th
 Downloading installation media and booting the system
 =====================================================
 
-#. Download the ISO image appropriate for your architecture from :ref:`GettingDownloads` or below:
+#. Download the ISO image from :ref:`GettingDownloads` or below:
 
     +--------------+-------------------------------------------------------------------------------+
     | Architecture | Downloads                                                                     |
     +==============+===============================================================================+
-    | i386         | :centos_fullinstall_iso:`iso <i386>` :centos_fullinstall_md5:`md5 <i386>`     |
-    +--------------+-------------------------------------------------------------------------------+
     | x86_64       | :centos_fullinstall_iso:`iso <x86_64>` :centos_fullinstall_md5:`md5 <x86_64>` |
     +--------------+-------------------------------------------------------------------------------+
 #. Verify the md5 checksum by verifying the two lines output are the same when you run the command below (replace the filenames with that of the downloaded iso and md5). If they do no match then you may need to re-download the iso images:
 
         .. code-block:: console
 
-            $ md5sum pS-Toolkit-3.X-FullInstall-i386.iso;cat pS-Toolkit-3.X-FullInstall-i386.iso.md5
+            $ md5sum pS-Toolkit-4.X-CentOS7-FullInstall-x86_64.iso;cat pS-Toolkit-4.X-CentOS7-FullInstall-x86_64.iso.md5
 
 #. Mount the ISO to a DVD or USB drive 
      .. note:: The Full Install ISO is generally too large to fit on current writable CDs

install_centos_netinstall.rst

@@ -8,20 +8,18 @@ The CentOS NetInstall distribution of the perfSONAR Toolkit is an ISO image that
 
 Downloading installation media and booting the system
 =====================================================
-#. Download the ISO image appropriate for your architecture from :ref:`GettingDownloads` or below:
+#. Download the ISO image from :ref:`GettingDownloads` or below:
 
     +--------------+-------------------------------------------------------------------------------+
     | Architecture | Downloads                                                                     |
     +==============+===============================================================================+
-    | i386         | :centos_netinstall_iso:`iso <i386>` :centos_netinstall_md5:`md5 <i386>`       |
-    +--------------+-------------------------------------------------------------------------------+
     | x86_64       | :centos_netinstall_iso:`iso <x86_64>` :centos_netinstall_md5:`md5 <x86_64>`   |
     +--------------+-------------------------------------------------------------------------------+
 #. Verify the md5 checksum by verifying the two lines output are the same when you run the command below (replace the filenames with that of the downloaded iso and md5). If they do no match then you may need to re-download the iso images:
 
         .. code-block:: console
 
-            $ md5sum pS-Toolkit-3.X-NetInstall-i386.iso;cat pS-Toolkit-3.X-NetInstall-i386.iso.md5
+            $ md5sum pS-Toolkit-4.X-CentOS7-NetInstall-x86_64.iso;cat pS-Toolkit-4.X-CentOS7-NetInstall-x86_64.iso.md5
 
 #. Mount the ISO to a CD, DVD, or USB drive
      .. note:: Detailed instructions on mounting an ISO image to the above media is beyond the scope of this document. Linux and Macintosh users may consider using the dd tool: ``sudo dd if=/PATH/TO/FILE.iso of=/dev/DISK``

install_getting.rst

@@ -20,17 +20,14 @@ The perfSONAR Toolkit is currently made available as an ISO image that can be mo
 
 Downloads
 =========
+.. note:: As of perfSONAR Toolkit 4.0 only CentOS 7 ISOs are supported. CentOS 7 only supports x86_64 architectures so i386 is dropped as well.
 
 +----------------------------+--------------+-------------------------------------------------------------------------------+-----------------------------------+
 | Installation Type          | Architecture | Downloads                                                                     | Step-by-Step Install Guide        |
 +============================+==============+===============================================================================+===================================+
-| |CentOS| NetInstall        | i386         | :centos_netinstall_iso:`iso <i386>` :centos_netinstall_md5:`md5 <i386>`       | :doc:`install_centos_netinstall`  |
+| |CentOS| NetInstall        | x86_64       | :centos_netinstall_iso:`iso <x86_64>` :centos_netinstall_md5:`md5 <x86_64>`   | :doc:`install_centos_netinstall`  |
 +----------------------------+--------------+-------------------------------------------------------------------------------+-----------------------------------+
-|                            | x86_64       | :centos_netinstall_iso:`iso <x86_64>` :centos_netinstall_md5:`md5 <x86_64>`   |                                   +
-+----------------------------+--------------+-------------------------------------------------------------------------------+-----------------------------------+
-| |CentOS| Full Install      | i386         | :centos_fullinstall_iso:`iso <i386>` :centos_fullinstall_md5:`md5 <i386>`     | :doc:`install_centos_fullinstall` |
-+----------------------------+--------------+-------------------------------------------------------------------------------+-----------------------------------+
-|                            | x86_64       | :centos_fullinstall_iso:`iso <x86_64>` :centos_fullinstall_md5:`md5 <x86_64>` |                                   +
+| |CentOS| Full Install      | x86_64       | :centos_fullinstall_iso:`iso <x86_64>` :centos_fullinstall_md5:`md5 <x86_64>` | :doc:`install_centos_fullinstall` |
 +----------------------------+--------------+-------------------------------------------------------------------------------+-----------------------------------+
 
 

install_quick_start.rst

@@ -4,7 +4,7 @@ Toolkit Installation Quick Start
 
 These instructions are for the full Toolkit installation. For other perfSONAR installtion options, see :doc:`install_options`.
 
-#. Download the NetInstall ISO for :centos_netinstall_iso:`i386` or :centos_netinstall_iso:`x86_64` depending on your system's architecture.
+#. Download the NetInstall ISO from :centos_netinstall_iso:`here <x86_64>`
 
         .. seealso:: The NetInstall is the recommended installation type, but for more information on other installation types see :doc:`install_getting`.
 #. Using your favorite software, burn the image to a CD, DVD or USB drive and insert the chosen installation media into your host.