diff --git a/modules/installation-osp-configuring-floating-ip.adoc b/modules/installation-osp-configuring-floating-ip.adoc index 9985fd942e3e..c8857c8cd498 100644 --- a/modules/installation-osp-configuring-floating-ip.adoc +++ b/modules/installation-osp-configuring-floating-ip.adoc @@ -52,4 +52,4 @@ If you do not control the DNS server but want to enable application access for n grafana-openshift-monitoring.apps.. .apps.. ---- -==== +==== \ No newline at end of file diff --git a/modules/installation-osp-creating-bootstrap-machine.adoc b/modules/installation-osp-creating-bootstrap-machine.adoc index 3e79b60428b6..bfa76169427b 100644 --- a/modules/installation-osp-creating-bootstrap-machine.adoc +++ b/modules/installation-osp-creating-bootstrap-machine.adoc @@ -16,18 +16,22 @@ 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`: + +.`bootstrap.yaml` +[%collapsible] +==== [source,yaml] ---- include::https://raw.githubusercontent.com/openshift/installer/release-4.5/upi/openstack/bootstrap.yaml[] ---- +==== . On a command line, run the playbook: + [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 9f1f2959d06c..5f26e0cb877e 100644 --- a/modules/installation-osp-creating-compute-machines.adoc +++ b/modules/installation-osp-creating-compute-machines.adoc @@ -18,18 +18,22 @@ 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`: + +.`compute-nodes.yaml` +[%collapsible] +==== [source,yaml] ---- include::https://raw.githubusercontent.com/openshift/installer/release-4.5/upi/openstack/compute-nodes.yaml[] ---- +==== . On a command line, run the playbook: + [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 781ce75d4158..361475206ded 100644 --- a/modules/installation-osp-creating-control-plane.adoc +++ b/modules/installation-osp-creating-control-plane.adoc @@ -19,18 +19,22 @@ 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`: + +.`control-plane.yaml` +[%collapsible] +==== [source,yaml] ---- include::https://raw.githubusercontent.com/openshift/installer/release-4.5/upi/openstack/control-plane.yaml[] ---- +==== . On a command line, run the playbook: + [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 c6537a7b93ac..d57fb0c9effd 100644 --- a/modules/installation-osp-creating-network-resources.adoc +++ b/modules/installation-osp-creating-network-resources.adoc @@ -21,31 +21,41 @@ include::https://raw.githubusercontent.com/openshift/installer/release-4.5/upi/o ---- include::https://raw.githubusercontent.com/openshift/installer/release-4.5/upi/openstack/inventory.yaml[] ---- -. 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`: + +.`security-groups.yaml` +[%collapsible] +==== [source,yaml] ---- include::https://raw.githubusercontent.com/openshift/installer/release-4.5/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`: + +.`network.yaml` +[%collapsible] +==== [source,yaml] ---- include::https://raw.githubusercontent.com/openshift/installer/release-4.5/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 5a0f97a148bf..65d8050e1176 100644 --- a/modules/installation-osp-deleting-bootstrap-resources.adoc +++ b/modules/installation-osp-deleting-bootstrap-resources.adoc @@ -16,18 +16,22 @@ 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-bootstrap.yaml` +[%collapsible] +==== [source,yaml] ---- include::https://raw.githubusercontent.com/openshift/installer/release-4.5/upi/openstack/down-bootstrap.yaml[] ---- +==== . On a command line, run the playbook: + [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 6c88fd123444..5bf225b45b9c 100644 --- a/modules/installation-uninstall-infra.adoc +++ b/modules/installation-uninstall-infra.adoc @@ -31,59 +31,83 @@ include::https://raw.githubusercontent.com/openshift/installer/release-4.5/upi/o include::https://raw.githubusercontent.com/openshift/installer/release-4.5/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-load-balancers.yaml` +[%collapsible] +==== [source,yaml] ---- include::https://raw.githubusercontent.com/openshift/installer/release-4.5/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-compute-nodes.yaml` +[%collapsible] +==== [source,yaml] ---- include::https://raw.githubusercontent.com/openshift/installer/release-4.5/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-control-plane.yaml` +[%collapsible] +==== [source,yaml] ---- include::https://raw.githubusercontent.com/openshift/installer/release-4.5/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-bootstrap.yaml` +[%collapsible] +==== [source,yaml] ---- include::https://raw.githubusercontent.com/openshift/installer/release-4.5/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-network.yaml` +[%collapsible] +==== [source,yaml] ---- include::https://raw.githubusercontent.com/openshift/installer/release-4.5/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-security-groups.yaml` +[%collapsible] +==== [source,yaml] ---- include::https://raw.githubusercontent.com/openshift/installer/release-4.5/upi/openstack/down-security-groups.yaml[] ---- +==== . On a command line, run the playbooks you created: + [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.