From 4a035060efaea599932578ae229d696fb22f6c8e Mon Sep 17 00:00:00 2001 From: Max Bridges Date: Tue, 23 Jun 2020 14:26:46 -0400 Subject: [PATCH 1/2] Remove OSP playbook # prefixes --- ...lation-osp-creating-bootstrap-machine.adoc | 6 ++-- ...llation-osp-creating-compute-machines.adoc | 6 ++-- ...stallation-osp-creating-control-plane.adoc | 6 ++-- ...lation-osp-creating-network-resources.adoc | 16 ++++----- ...tion-osp-deleting-bootstrap-resources.adoc | 6 ++-- modules/installation-uninstall-infra.adoc | 36 +++++++++---------- 6 files changed, 38 insertions(+), 38 deletions(-) diff --git a/modules/installation-osp-creating-bootstrap-machine.adoc b/modules/installation-osp-creating-bootstrap-machine.adoc index c10d8a23493f..340aa3550cc7 100644 --- a/modules/installation-osp-creating-bootstrap-machine.adoc +++ b/modules/installation-osp-creating-bootstrap-machine.adoc @@ -16,9 +16,9 @@ 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] @@ -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..1e6d055081d8 100644 --- a/modules/installation-osp-creating-compute-machines.adoc +++ b/modules/installation-osp-creating-compute-machines.adoc @@ -18,9 +18,9 @@ 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] @@ -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..531ee1d2997d 100644 --- a/modules/installation-osp-creating-control-plane.adoc +++ b/modules/installation-osp-creating-control-plane.adoc @@ -19,9 +19,9 @@ 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] @@ -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..1c70bde858d6 100644 --- a/modules/installation-osp-creating-network-resources.adoc +++ b/modules/installation-osp-creating-network-resources.adoc @@ -40,9 +40,9 @@ 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] @@ -51,9 +51,9 @@ include::https://raw.githubusercontent.com/openshift/installer/release-4.6/upi/o ---- ==== -. 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] @@ -62,18 +62,18 @@ include::https://raw.githubusercontent.com/openshift/installer/release-4.6/upi/o ---- ==== -. 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..908dbddf48f6 100644 --- a/modules/installation-osp-deleting-bootstrap-resources.adoc +++ b/modules/installation-osp-deleting-bootstrap-resources.adoc @@ -16,9 +16,9 @@ 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] @@ -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..c58d00963fa6 100644 --- a/modules/installation-uninstall-infra.adoc +++ b/modules/installation-uninstall-infra.adoc @@ -39,9 +39,9 @@ include::https://raw.githubusercontent.com/openshift/installer/release-4.6/upi/o ---- ==== -. _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] @@ -50,9 +50,9 @@ include::https://raw.githubusercontent.com/openshift/installer/release-4.6/upi/o ---- ==== -. 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] @@ -61,9 +61,9 @@ include::https://raw.githubusercontent.com/openshift/installer/release-4.6/upi/o ---- ==== -. 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] @@ -72,9 +72,9 @@ include::https://raw.githubusercontent.com/openshift/installer/release-4.6/upi/o ---- ==== -. 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] @@ -83,9 +83,9 @@ include::https://raw.githubusercontent.com/openshift/installer/release-4.6/upi/o ---- ==== -. 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] @@ -94,9 +94,9 @@ include::https://raw.githubusercontent.com/openshift/installer/release-4.6/upi/o ---- ==== -. 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] @@ -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. From ccaf692a2096a27f0263ef97b786ef926899b63b Mon Sep 17 00:00:00 2001 From: Max Bridges Date: Tue, 27 Oct 2020 11:07:31 -0400 Subject: [PATCH 2/2] Minor version increment in OSP UPI playbook URLs. --- ...tallation-osp-creating-bootstrap-machine.adoc | 2 +- ...stallation-osp-creating-compute-machines.adoc | 2 +- .../installation-osp-creating-control-plane.adoc | 2 +- ...tallation-osp-creating-network-resources.adoc | 8 ++++---- ...llation-osp-deleting-bootstrap-resources.adoc | 2 +- modules/installation-uninstall-infra.adoc | 16 ++++++++-------- 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/modules/installation-osp-creating-bootstrap-machine.adoc b/modules/installation-osp-creating-bootstrap-machine.adoc index 340aa3550cc7..5e53761cb994 100644 --- a/modules/installation-osp-creating-bootstrap-machine.adoc +++ b/modules/installation-osp-creating-bootstrap-machine.adoc @@ -23,7 +23,7 @@ Create a bootstrap machine and give it the network access it needs to run on {rh ==== [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[] ---- ==== diff --git a/modules/installation-osp-creating-compute-machines.adoc b/modules/installation-osp-creating-compute-machines.adoc index 1e6d055081d8..8c6df480d00d 100644 --- a/modules/installation-osp-creating-compute-machines.adoc +++ b/modules/installation-osp-creating-compute-machines.adoc @@ -25,7 +25,7 @@ After standing up the control plane, create compute machines. ==== [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[] ---- ==== diff --git a/modules/installation-osp-creating-control-plane.adoc b/modules/installation-osp-creating-control-plane.adoc index 531ee1d2997d..25e5c73a1e1a 100644 --- a/modules/installation-osp-creating-control-plane.adoc +++ b/modules/installation-osp-creating-control-plane.adoc @@ -26,7 +26,7 @@ Create three control plane machines by using the Ignition config files that you ==== [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[] ---- ==== diff --git a/modules/installation-osp-creating-network-resources.adoc b/modules/installation-osp-creating-network-resources.adoc index 1c70bde858d6..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[] ---- ==== + @@ -47,7 +47,7 @@ See "Enabling access to the environment" for more information. ==== [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[] ---- ==== @@ -58,7 +58,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/network.yaml[] +include::https://raw.githubusercontent.com/openshift/installer/release-4.7/upi/openstack/network.yaml[] ---- ==== diff --git a/modules/installation-osp-deleting-bootstrap-resources.adoc b/modules/installation-osp-deleting-bootstrap-resources.adoc index 908dbddf48f6..74590e13fd2b 100644 --- a/modules/installation-osp-deleting-bootstrap-resources.adoc +++ b/modules/installation-osp-deleting-bootstrap-resources.adoc @@ -23,7 +23,7 @@ Delete the bootstrap resources that you no longer need. ==== [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[] ---- ==== diff --git a/modules/installation-uninstall-infra.adoc b/modules/installation-uninstall-infra.adoc index c58d00963fa6..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,7 +35,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[] ---- ==== @@ -46,7 +46,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/down-load-balancers.yaml[] +include::https://raw.githubusercontent.com/openshift/installer/release-4.7/upi/openstack/down-load-balancers.yaml[] ---- ==== @@ -57,7 +57,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/down-compute-nodes.yaml[] +include::https://raw.githubusercontent.com/openshift/installer/release-4.7/upi/openstack/down-compute-nodes.yaml[] ---- ==== @@ -68,7 +68,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/down-control-plane.yaml[] +include::https://raw.githubusercontent.com/openshift/installer/release-4.7/upi/openstack/down-control-plane.yaml[] ---- ==== @@ -79,7 +79,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/down-bootstrap.yaml[] +include::https://raw.githubusercontent.com/openshift/installer/release-4.7/upi/openstack/down-bootstrap.yaml[] ---- ==== @@ -90,7 +90,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/down-network.yaml[] +include::https://raw.githubusercontent.com/openshift/installer/release-4.7/upi/openstack/down-network.yaml[] ---- ==== @@ -101,7 +101,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/down-security-groups.yaml[] +include::https://raw.githubusercontent.com/openshift/installer/release-4.7/upi/openstack/down-security-groups.yaml[] ---- ====