diff --git a/modules/installation-osp-creating-bootstrap-machine.adoc b/modules/installation-osp-creating-bootstrap-machine.adoc index c10d8a23493f..5e53761cb994 100644 --- a/modules/installation-osp-creating-bootstrap-machine.adoc +++ b/modules/installation-osp-creating-bootstrap-machine.adoc @@ -16,14 +16,14 @@ Create a bootstrap machine and give it the network access it needs to run on {rh . On a command line, change the working directory to the location of the `inventory.yaml` and `common.yaml` files. -. Insert the following content into a local file that is called `03_bootstrap.yaml`: +. Insert the following content into a local file that is called `bootstrap.yaml`: + -.`03_bootstrap.yaml` +.`bootstrap.yaml` [%collapsible] ==== [source,yaml] ---- -include::https://raw.githubusercontent.com/openshift/installer/release-4.6/upi/openstack/bootstrap.yaml[] +include::https://raw.githubusercontent.com/openshift/installer/release-4.7/upi/openstack/bootstrap.yaml[] ---- ==== @@ -31,7 +31,7 @@ include::https://raw.githubusercontent.com/openshift/installer/release-4.6/upi/o + [source,terminal] ---- -$ ansible-playbook -i inventory.yaml 03_bootstrap.yaml +$ ansible-playbook -i inventory.yaml bootstrap.yaml ---- . After the bootstrap server is active, view the logs to verify that the Ignition files were received: diff --git a/modules/installation-osp-creating-compute-machines.adoc b/modules/installation-osp-creating-compute-machines.adoc index f08339b3a4e0..8c6df480d00d 100644 --- a/modules/installation-osp-creating-compute-machines.adoc +++ b/modules/installation-osp-creating-compute-machines.adoc @@ -18,14 +18,14 @@ After standing up the control plane, create compute machines. . On a command line, change the working directory to the location of the `inventory.yaml` and `common.yaml` files. -. Insert the following content into a local file that is called `05_compute-nodes.yaml`: +. Insert the following content into a local file that is called `compute-nodes.yaml`: + -.`05_compute-nodes.yaml` +.`compute-nodes.yaml` [%collapsible] ==== [source,yaml] ---- -include::https://raw.githubusercontent.com/openshift/installer/release-4.6/upi/openstack/compute-nodes.yaml[] +include::https://raw.githubusercontent.com/openshift/installer/release-4.7/upi/openstack/compute-nodes.yaml[] ---- ==== @@ -33,7 +33,7 @@ include::https://raw.githubusercontent.com/openshift/installer/release-4.6/upi/o + [source,terminal] ---- -$ ansible-playbook -i inventory.yaml 05_compute-nodes.yaml +$ ansible-playbook -i inventory.yaml compute-nodes.yaml ---- .Next steps diff --git a/modules/installation-osp-creating-control-plane.adoc b/modules/installation-osp-creating-control-plane.adoc index f6fef784870d..25e5c73a1e1a 100644 --- a/modules/installation-osp-creating-control-plane.adoc +++ b/modules/installation-osp-creating-control-plane.adoc @@ -19,14 +19,14 @@ Create three control plane machines by using the Ignition config files that you . If the control plane Ignition config files aren't already in your working directory, copy them into it. -. Insert the following content into a local file that is called `04_control-plane.yaml`: +. Insert the following content into a local file that is called `control-plane.yaml`: + -.`04_control-plane.yaml` +.`control-plane.yaml` [%collapsible] ==== [source,yaml] ---- -include::https://raw.githubusercontent.com/openshift/installer/release-4.6/upi/openstack/control-plane.yaml[] +include::https://raw.githubusercontent.com/openshift/installer/release-4.7/upi/openstack/control-plane.yaml[] ---- ==== @@ -34,7 +34,7 @@ include::https://raw.githubusercontent.com/openshift/installer/release-4.6/upi/o + [source,terminal] ---- -$ ansible-playbook -i inventory.yaml 04_control-plane.yaml +$ ansible-playbook -i inventory.yaml control-plane.yaml ---- . Run the following command to monitor the bootstrapping process: diff --git a/modules/installation-osp-creating-network-resources.adoc b/modules/installation-osp-creating-network-resources.adoc index a32efb84d99f..9269b5d46643 100644 --- a/modules/installation-osp-creating-network-resources.adoc +++ b/modules/installation-osp-creating-network-resources.adoc @@ -16,7 +16,7 @@ Create the network resources that an {product-title} on {rh-openstack-first} ins ==== [source,yaml] ---- -include::https://raw.githubusercontent.com/openshift/installer/release-4.6/upi/openstack/common.yaml[] +include::https://raw.githubusercontent.com/openshift/installer/release-4.7/upi/openstack/common.yaml[] ---- ==== @@ -27,7 +27,7 @@ include::https://raw.githubusercontent.com/openshift/installer/release-4.6/upi/o ==== [source,yaml] ---- -include::https://raw.githubusercontent.com/openshift/installer/release-4.6/upi/openstack/inventory.yaml[] +include::https://raw.githubusercontent.com/openshift/installer/release-4.7/upi/openstack/inventory.yaml[] ---- ==== + @@ -40,40 +40,40 @@ If you do not define a value for `os_bootstrap_fip`, the installer cannot downlo See "Enabling access to the environment" for more information. ==== -. Insert the following content into a local file that is called `01_security-groups.yaml`: +. Insert the following content into a local file that is called `security-groups.yaml`: + -.`01_security-groups.yaml` +.`security-groups.yaml` [%collapsible] ==== [source,yaml] ---- -include::https://raw.githubusercontent.com/openshift/installer/release-4.6/upi/openstack/security-groups.yaml[] +include::https://raw.githubusercontent.com/openshift/installer/release-4.7/upi/openstack/security-groups.yaml[] ---- ==== -. Insert the following content into a local file that is called `02_network.yaml`: +. Insert the following content into a local file that is called `network.yaml`: + -.`02_network.yaml` +.`network.yaml` [%collapsible] ==== [source,yaml] ---- -include::https://raw.githubusercontent.com/openshift/installer/release-4.6/upi/openstack/network.yaml[] +include::https://raw.githubusercontent.com/openshift/installer/release-4.7/upi/openstack/network.yaml[] ---- ==== -. On a command line, create security groups by running the first numbered playbook: +. On a command line, create security groups by running the `security-groups.yaml` playbook: + [source,terminal] ---- -$ ansible-playbook -i inventory.yaml 01_security-groups.yaml +$ ansible-playbook -i inventory.yaml security-groups.yaml ---- -. On a command line, create a network, subnet, and router by running the second numbered playbook: +. On a command line, create a network, subnet, and router by running the `network.yaml` playbook: + [source,terminal] ---- -$ ansible-playbook -i inventory.yaml 02_network.yaml +$ ansible-playbook -i inventory.yaml network.yaml ---- . Optional: If you want to control the default resolvers that Nova servers use, run the {rh-openstack} CLI command: diff --git a/modules/installation-osp-deleting-bootstrap-resources.adoc b/modules/installation-osp-deleting-bootstrap-resources.adoc index 2380e582fffc..74590e13fd2b 100644 --- a/modules/installation-osp-deleting-bootstrap-resources.adoc +++ b/modules/installation-osp-deleting-bootstrap-resources.adoc @@ -16,14 +16,14 @@ Delete the bootstrap resources that you no longer need. .Procedure -. Insert the following content into a local file that is called `down-03_bootstrap.yaml`: +. Insert the following content into a local file that is called `down-bootstrap.yaml`: + -.`down-03_bootstrap.yaml` +.`down-bootstrap.yaml` [%collapsible] ==== [source,yaml] ---- -include::https://raw.githubusercontent.com/openshift/installer/release-4.6/upi/openstack/down-bootstrap.yaml[] +include::https://raw.githubusercontent.com/openshift/installer/release-4.7/upi/openstack/down-bootstrap.yaml[] ---- ==== @@ -31,7 +31,7 @@ include::https://raw.githubusercontent.com/openshift/installer/release-4.6/upi/o + [source,terminal] ---- -$ ansible-playbook -i inventory.yaml down-03_bootstrap.yaml +$ ansible-playbook -i inventory.yaml down-bootstrap.yaml ---- The bootstrap port, server, and floating IP address are deleted. diff --git a/modules/installation-uninstall-infra.adoc b/modules/installation-uninstall-infra.adoc index e49a8e93612b..77535ab2d023 100644 --- a/modules/installation-uninstall-infra.adoc +++ b/modules/installation-uninstall-infra.adoc @@ -24,7 +24,7 @@ You may have the `common.yaml` and `inventory.yaml` playbooks left over from whe ==== [source,yaml] ---- -include::https://raw.githubusercontent.com/openshift/installer/release-4.6/upi/openstack/common.yaml[] +include::https://raw.githubusercontent.com/openshift/installer/release-4.7/upi/openstack/common.yaml[] ---- ==== @@ -35,73 +35,73 @@ include::https://raw.githubusercontent.com/openshift/installer/release-4.6/upi/o ==== [source,yaml] ---- -include::https://raw.githubusercontent.com/openshift/installer/release-4.6/upi/openstack/inventory.yaml[] +include::https://raw.githubusercontent.com/openshift/installer/release-4.7/upi/openstack/inventory.yaml[] ---- ==== -. _Optional_: If your cluster uses Kuryr, insert the following content into a local file called `down-06_load-balancers.yaml`: +. _Optional_: If your cluster uses Kuryr, insert the following content into a local file called `down-load-balancers.yaml`: + -.`down-06_load-balancers.yaml` +.`down-load-balancers.yaml` [%collapsible] ==== [source,yaml] ---- -include::https://raw.githubusercontent.com/openshift/installer/release-4.6/upi/openstack/down-load-balancers.yaml[] +include::https://raw.githubusercontent.com/openshift/installer/release-4.7/upi/openstack/down-load-balancers.yaml[] ---- ==== -. Insert the following content into a local file called `down-05_compute-nodes.yaml`: +. Insert the following content into a local file called `down-compute-nodes.yaml`: + -.`down-05_compute-nodes.yaml` +.`down-compute-nodes.yaml` [%collapsible] ==== [source,yaml] ---- -include::https://raw.githubusercontent.com/openshift/installer/release-4.6/upi/openstack/down-compute-nodes.yaml[] +include::https://raw.githubusercontent.com/openshift/installer/release-4.7/upi/openstack/down-compute-nodes.yaml[] ---- ==== -. Insert the following content into a local file called `down-04_control-plane.yaml`: +. Insert the following content into a local file called `down-control-plane.yaml`: + -.`down-04_control-plane.yaml` +.`down-control-plane.yaml` [%collapsible] ==== [source,yaml] ---- -include::https://raw.githubusercontent.com/openshift/installer/release-4.6/upi/openstack/down-control-plane.yaml[] +include::https://raw.githubusercontent.com/openshift/installer/release-4.7/upi/openstack/down-control-plane.yaml[] ---- ==== -. Insert the following content into a local file called `down-03_bootstrap.yaml`: +. Insert the following content into a local file called `down-bootstrap.yaml`: + -.`down-03_bootstrap.yaml` +.`down-bootstrap.yaml` [%collapsible] ==== [source,yaml] ---- -include::https://raw.githubusercontent.com/openshift/installer/release-4.6/upi/openstack/down-bootstrap.yaml[] +include::https://raw.githubusercontent.com/openshift/installer/release-4.7/upi/openstack/down-bootstrap.yaml[] ---- ==== -. Insert the following content into a local file called `down-02_network.yaml`: +. Insert the following content into a local file called `down-network.yaml`: + -.`down-02_network.yaml` +.`down-network.yaml` [%collapsible] ==== [source,yaml] ---- -include::https://raw.githubusercontent.com/openshift/installer/release-4.6/upi/openstack/down-network.yaml[] +include::https://raw.githubusercontent.com/openshift/installer/release-4.7/upi/openstack/down-network.yaml[] ---- ==== -. Insert the following content into a local file called `down-01_security-groups.yaml`: +. Insert the following content into a local file called `down-security-groups.yaml`: + -.`down-01_security-groups.yaml` +.`down-security-groups.yaml` [%collapsible] ==== [source,yaml] ---- -include::https://raw.githubusercontent.com/openshift/installer/release-4.6/upi/openstack/down-security-groups.yaml[] +include::https://raw.githubusercontent.com/openshift/installer/release-4.7/upi/openstack/down-security-groups.yaml[] ---- ==== @@ -110,12 +110,12 @@ include::https://raw.githubusercontent.com/openshift/installer/release-4.6/upi/o [source,terminal] ---- $ ansible-playbook -i inventory.yaml \ - down-03_bootstrap.yaml \ - down-04_control-plane.yaml \ - down-05_compute-nodes.yaml \ - down-06_load-balancers.yaml \ - down-02_network.yaml \ - down-01_security-groups.yaml + down-bootstrap.yaml \ + down-control-plane.yaml \ + down-compute-nodes.yaml \ + down-load-balancers.yaml \ + down-network.yaml \ + down-security-groups.yaml ---- . Remove any DNS record changes you made for the {product-title} installation.