openshift · openshift-merge-robot · Sep 11, 2018 · Sep 11, 2018
diff --git a/Documentation/contrib/modify-installer.md b/Documentation/contrib/modify-installer.md
@@ -7,7 +7,6 @@ Please also note that using "alpha features" through existing Beta or Stable API
 ## Machine level modifications
 
 Always safe to modify:
-* Container Linux channels. All Container Linux channels may be modified (stable, beta, and alpha).
 
 Never safe to modify:
 * Kubelet configuration, including CNI. Modification of the kubelet configuration may result in an inability to start pods, or a failure in communication between cluster components.

diff --git a/Documentation/dev/libvirt-howto.md b/Documentation/dev/libvirt-howto.md
@@ -5,7 +5,7 @@ for operator development.
 
 ## HOW TO:
 ### 1. One-time setup
-It's expected that you will create and destroy clusters often in the course of development. These steps only need to be run once (or once per Container Linux or RHCOS update).
+It's expected that you will create and destroy clusters often in the course of development. These steps only need to be run once (or once per RHCOS update).
 
 #### 1.1 Pick a name and ip range
 In this example, we'll set the baseDomain to `tt.testing`, the name to `test1` and the ipRange to `192.168.124.0/24`
@@ -18,28 +18,13 @@ cd installer
 
 #### 1.3 Download and prepare the operating system image
 
-#### 1.3a RHCOS
-
 Download the latest RHCOS image (you will need access to the Red Hat internal build systems):
 
 ```sh
 wget http://aos-ostree.rhev-ci-vms.eng.rdu2.redhat.com/rhcos/images/cloud/latest/rhcos-qemu.qcow2.gz
 gunzip rhcos-qemu.qcow2.gz
 ```
 
-#### 1.3b Container Linux
-
-Download the latest stable Container Linux image:
-```sh
-wget https://stable.release.core-os.net/amd64-usr/current/coreos_production_qemu_image.img.bz2
-bunzip2 coreos_production_qemu_image.img.bz2
-```
-
-Because of the greater disk requirements of OpenShift, you'll need to expand the root drive with the following:
-```sh
-qemu-img resize coreos_production_qemu_image.img +8G
-```
-
 #### 1.4 Get a pull secret
 Go to https://account.coreos.com/ and obtain a Tectonic *pull secret*.
 

diff --git a/modules/aws/ami/README.md b/modules/aws/ami/README.md
diff --git a/modules/aws/ami/main.tf b/modules/aws/ami/main.tf
diff --git a/modules/aws/ami/variables.tf b/modules/aws/ami/variables.tf
diff --git a/steps/variables-libvirt.tf b/steps/variables-libvirt.tf
@@ -20,7 +20,7 @@ variable "tectonic_libvirt_ip_range" {
 
 variable "tectonic_coreos_qcow_path" {
   type        = "string"
-  description = "path to a container linux qcow image"
+  description = "path to a Red Hat CoreOS qcow image"
 }
 
 variable "tectonic_libvirt_bootstrap_ip" {