Merge "Clean up the basic install instructions"

doc/source/basic_deployment/basic_deployment_cli.rst

@@ -42,13 +42,13 @@ Get Images
 
            deploy-ramdisk-ironic.initramfs
            deploy-ramdisk-ironic.kernel
-           discovery-ramdisk.initramfs
+           ironic-python-agent.initramfs
-           discovery-ramdisk.kernel
+           ironic-python-agent.kernel
            overcloud-full.initrd
            overcloud-full.qcow2
            overcloud-full.vmlinuz
 
-Images must be built prior to doing a deployment. A discovery ramdisk,
+Images must be built prior to doing a deployment. An IPA ramdisk,
 deployment ramdisk, and openstack-full image can all be built using
 instack-undercloud.
 
@@ -79,6 +79,11 @@ non-root user that was used to install the undercloud.
 
           export NODE_DIST=rhel7
 
+#. Use undercloud delorean repos to build the overcloud images:
+
+    ::
+
+        export DIB_YUM_REPO_CONF="/etc/yum.repos.d/delorean.repo /etc/yum.repos.d/delorean-deps.repo"
 
 #. Build the required images:
 
@@ -127,13 +132,6 @@ non-root user that was used to install the undercloud.
             # rhel-7-server-openstack-6.0-rpms
             export REG_ACTIVATION_KEY="[activation key]"
 
-  .. note ::
-    By default, images are built with the latest delorean repository which has passed CI. If you need to manually test packages before CI has passed, you can use:
-
-    ::
-
-      export DELOREAN_TRUNK_MGT_REPO="http://trunk.rdoproject.org/centos7/current/"
-
   .. admonition:: Source
      :class: source
 
@@ -150,7 +148,7 @@ non-root user that was used to install the undercloud.
   .. note::
     This script will build **overcloud-full** images (\*.qcow2, \*.initrd,
     \*.vmlinuz), **deploy-ramdisk-ironic** images (\*.initramfs, \*.kernel),
-    **discovery-ramdisk** images (\*.initramfs, \*.kernel) and **testing**
+    **ironic-python-agent** images (\*.initramfs, \*.kernel) and **testing**
     fedora-user.qcow2 (which is always Fedora based).
 
 

doc/source/installation/installing.rst

@@ -52,12 +52,20 @@ Installing the Undercloud
          sudo yum install -y yum-utils
          sudo yum-config-manager --enable rhelosp-rhel-7-server-opt
 
-.. include:: ../repositories.txt
+  Enable epel::
 
+    sudo yum -y install epel-release
+
+.. include:: ../repositories.txt
 
 .. We need to manually continue our list numbering here since the above
   "include" directive breaks the numbering.
-3. Install the TripleO CLI, which will pull in all other necessary packages as dependencies::
+
+3. Install the yum-plugin-priorities package so that the Delorean repository takes precedence over the main RDO repositories::
+
+     sudo yum -y install yum-plugin-priorities
+
+#. Install the TripleO CLI, which will pull in all other necessary packages as dependencies::
 
     sudo yum install -y python-tripleoclient
 

doc/source/installation/updating.rst

@@ -3,14 +3,18 @@ Updating Undercloud Components
 
 You can upgrade any packages that are installed on the undercloud machine.
 
-#. Update the Delorean Trunk repository::
+#. Remove all Delorean repositories::
 
+       sudo rm /etc/yum.repos.d/delorean*
 
-       # Remove old and enable new Delorean Trunk repository
+#. Enable new Delorean repositories:
-       sudo rm /etc/yum.repos.d/delorean.repo
-       sudo curl -o /etc/yum.repos.d/delorean.repo http://trunk.rdoproject.org/centos7/current-passed-ci/delorean.repo
 
-#. Use yum to update all installed packages::
+.. include:: ../repositories.txt
+
+.. We need to manually continue our list numbering here since the above
+  "include" directive breaks the numbering.
+
+3. Use yum to update all installed packages::
 
     sudo yum update -y
 

doc/source/repositories.txt

@@ -1,19 +1,13 @@
-   Enable epel
+   Enable last known good RDO Trunk Delorean repository for core openstack packages
-
-   ::
-
-     sudo yum -y install epel-release
-
-
-   Enable last known good RDO Trunk Delorean repository
 
    ::
 
        sudo curl -o /etc/yum.repos.d/delorean.repo http://trunk.rdoproject.org/centos7/current-tripleo/delorean.repo
 
+   Enable latest RDO Trunk Delorean repository only for the |project| packages
+
    ::
 
-     # Enable latest RDO Trunk Delorean repository
      sudo curl -o /etc/yum.repos.d/delorean-current.repo http://trunk.rdoproject.org/centos7/current/delorean.repo
      sudo sed -i 's/\[delorean\]/\[delorean-current\]/' /etc/yum.repos.d/delorean-current.repo
      sudo /bin/bash -c "cat <<EOF>>/etc/yum.repos.d/delorean-current.repo
@@ -27,11 +21,3 @@
    ::
 
      sudo curl -o /etc/yum.repos.d/delorean-deps.repo http://trunk.rdoproject.org/centos7/delorean-deps.repo
-
-   Install the yum-plugin-priorities package so that the Delorean repository
-   takes precedence over the main RDO repositories.
-
-   ::
-
-     sudo yum -y install yum-plugin-priorities
-