Merge "Remove support for CoreOS images"

4 files changed, 7 insertions, 107 deletions

diff --git a/doc/source/admin/rescue.rst b/doc/source/admin/rescue.rst
index f6503f8af..5509796f4 100644
--- a/doc/source/admin/rescue.rst
+++ b/doc/source/admin/rescue.rst
@@ -31,8 +31,6 @@ operation. This will differ somewhat between different deploy environments,
 but an example of how to do this is outlined below:
 
 #. Create and configure ramdisk that supports rescue operation.
-   The ramdisk types that supports rescue operation is ironic-python-agent
-   with CoreOS/tinyIPA and DIB based ramdisk.
    Please see :doc:`/install/deploy-ramdisk` for detailed instructions to
    build a ramdisk.
 
diff --git a/doc/source/admin/troubleshooting.rst b/doc/source/admin/troubleshooting.rst
index e06959c00..644849677 100644
--- a/doc/source/admin/troubleshooting.rst
+++ b/doc/source/admin/troubleshooting.rst
@@ -181,9 +181,6 @@ directory back::
 .. note:: You don't need to modify the kernel (e.g.
           ``tinyipa-master.vmlinuz``), only the ramdisk part.
 
-.. note:: For CoreOS-based ramdisk you also need to unpack and pack back the
-          squashfs archive inside the unpacked ramdisk.
-
 API Errors
 ==========
 
diff --git a/doc/source/install/configure-glance-images.rst b/doc/source/install/configure-glance-images.rst
index e78d4d45f..f5a373de1 100644
--- a/doc/source/install/configure-glance-images.rst
+++ b/doc/source/install/configure-glance-images.rst
@@ -101,22 +101,15 @@ them to the Image service:
    There are several methods to build or download deploy images, please read
    the :ref:`deploy-ramdisk` section.
 
-   The recommended method is to use CoreOS to build deploy images, you will get
-   one kernel disk ``coreos_production_pxe.vmlinuz`` and one ram disk
-   ``coreos_production_pxe_image-oem.cpio.gz``.
-
-   .. note:: If you want to customize your deploy images, please read `Image Builders <https://docs.openstack.org/ironic-python-agent/latest/install/index.html#image-builders>`_.
-
 #. Add the deploy images to the Image service
 
-   Add the *coreos_production_pxe.vmlinuz* and *coreos_production_pxe_image-oem.cpio.gz*
-   images to the Image service:
+   Add the deployment kernel and ramdisk images to the Image service:
 
    .. code-block:: console
 
       $ openstack image create deploy-vmlinuz --public \
         --disk-format aki --container-format aki \
-        --file coreos_production_pxe.vmlinuz
+        --file ironic-python-agent.vmlinuz
 
    Store the image UUID obtained from the above step as ``DEPLOY_VMLINUZ_UUID``.
 
@@ -124,6 +117,6 @@ them to the Image service:
 
       $ openstack image create deploy-initrd --public \
         --disk-format ari --container-format ari \
-        --file coreos_production_pxe_image-oem.cpio.gz
+        --file ironic-python-agent.initramfs
 
    Store the image UUID obtained from the above step as ``DEPLOY_INITRD_UUID``.
diff --git a/doc/source/install/deploy-ramdisk.rst b/doc/source/install/deploy-ramdisk.rst
index a640dd87a..56c33a816 100644
--- a/doc/source/install/deploy-ramdisk.rst
+++ b/doc/source/install/deploy-ramdisk.rst
@@ -6,102 +6,14 @@ Building or downloading a deploy ramdisk image
 Ironic depends on having an image with the ironic-python-agent_ (IPA)
 service running on it for controlling and deploying bare metal nodes.
 
-You can download a pre-built version of the deploy ramdisk built with
-the `CoreOS tools`_ at:
-
-* `CoreOS deploy kernel <https://tarballs.openstack.org/ironic-python-agent/coreos/files/coreos_production_pxe.vmlinuz>`_
-* `CoreOS deploy ramdisk <https://tarballs.openstack.org/ironic-python-agent/coreos/files/coreos_production_pxe_image-oem.cpio.gz>`_
+.. TODO(dtantsur): a link to DIB ramdisks once we finally build them
 
 .. _ironic-python-agent: https://docs.openstack.org/ironic-python-agent/latest/
 
 Building from source
 --------------------
 
-There are two known methods for creating the deployment image with the
-IPA service:
-
-.. _BuildingCoreOSDeployRamdisk:
-
-CoreOS tools
-~~~~~~~~~~~~
-
-#. Clone the ironic-python-agent_ project::
-
-    git clone https://opendev.org/openstack/ironic-python-agent
-
-#. Install the requirements:
-
-   RHEL7/CentOS7::
-
-       sudo yum install docker gzip util-linux cpio findutils grep gpg
-
-   Fedora::
-
-       sudo dnf install docker gzip util-linux cpio findutils grep gpg
-
-   Ubuntu 14.04 (trusty) or higher::
-
-       sudo apt-get install docker.io gzip uuid-runtime cpio findutils grep gnupg cgroup-lite
-
-   SUSE::
-
-       sudo zypper install docker gzip util-linux cpio findutils grep gpg2
-
-#. Change directory to ``imagebuild/coreos``::
-
-    cd ironic-python-agent/imagebuild/coreos
-
-#. Start the docker daemon:
-
-   Fedora/RHEL7/CentOS7/SUSE::
-
-       sudo systemctl start docker
-
-   Ubuntu::
-
-       sudo service docker start
-
-#. Create the image::
-
-    sudo make
-
-#. Or, create an ISO image to boot with virtual media::
-
-    sudo make iso
-
-
-.. note::
-   Once built the deploy ramdisk and kernel will appear inside of a
-   directory called ``UPLOAD``.
-
-
-.. _BuildingDibBasedDeployRamdisk:
-
-disk-image-builder
-~~~~~~~~~~~~~~~~~~
-
-#. Follow `diskimage-builder installation documentation`_ to install
-   diskimage-builder.
-
-#. Create the image::
-
-    disk-image-create ironic-agent fedora -o ironic-deploy
-
-   The above command creates the deploy ramdisk and kernel named
-   ``ironic-deploy.vmlinuz`` and ``ironic-deploy.initramfs`` in your
-   current directory.
-
-#. Or, create an ISO image to boot with virtual media::
-
-    disk-image-create ironic-agent fedora iso -o ironic-deploy
-
-   The above command creates the deploy ISO named ``ironic-deploy.iso``
-   in your current directory.
-
-.. note::
-   Fedora was used as an example for the base operational system. Please
-   check the `diskimage-builder documentation`_ for other supported
-   operational systems.
+Check the ironic-python-agent-builder_ project for information on how to build
+ironic-python-agent ramdisks.
 
-.. _`diskimage-builder documentation`: https://docs.openstack.org/diskimage-builder/latest/
-.. _`diskimage-builder installation documentation`: https://docs.openstack.org/diskimage-builder/latest/user_guide/installation.html
+.. _ironic-python-agent-builder: https://docs.openstack.org/ironic-python-agent-builder/latest/