Merge pull request #740 from fao89/updowndocs

Update docs with upstream/downstream values

docs/assemblies/common_configurations.adoc

@@ -58,6 +58,7 @@ The container images used by the various roles from edpm-ansible can pull from
 customized locations. The ansible variables used to set the locations and their
 default values are:
 
+ifeval::["{build}" != "downstream"]
  	edpm_iscsid_image: "quay.io/podified-antelope-centos9/openstack-iscsid:current-podified"
  	edpm_logrotate_crond_image: "quay.io/podified-antelope-centos9/openstack-cron:current-podified"
  	edpm_ovn_controller_agent_image: "quay.io/podified-antelope-centos9/openstack-ovn-controller:current-podified"
@@ -69,6 +70,20 @@ default values are:
  	edpm_nova_compute_image: "quay.io/podified-antelope-centos9/openstack-nova-compute:current-podified"
  	edpm_neutron_sriov_image: "quay.io/podified-antelope-centos9/openstack-neutron-sriov-agent:current-podified"
  	edpm_multipathd_image: "quay.io/podified-antelope-centos9/openstack-multipathd:current-podified"
+endif::[]
+ifeval::["{build}" == "downstream"]
+ 	edpm_iscsid_image: "registry.redhat.io/rhosp-dev-preview/openstack-iscsid:18.0"
+ 	edpm_logrotate_crond_image: "registry.redhat.io/rhosp-dev-preview/openstack-cron:18.0"
+ 	edpm_ovn_controller_agent_image: "registry.redhat.io/rhosp-dev-preview/openstack-ovn-controller:18.0"
+ 	edpm_ovn_metadata_agent_image: "registry.redhat.io/rhosp-dev-preview/openstack-neutron-metadata-agent-ovn:18.0"
+ 	edpm_frr_image: "registry.redhat.io/rhosp-dev-preview/openstack-frr:18.0"
+ 	edpm_ovn_bgp_agent_image: "registry.redhat.io/rhosp-dev-preview/openstack-ovn-bgp-agent:18.0"
+ 	telemetry_node_exporter_image: quay.io/prometheus/node-exporter:v1.5.0
+ 	edpm_libvirt_image: "registry.redhat.io/rhosp-dev-preview/openstack-nova-libvirt:18.0"
+ 	edpm_nova_compute_image: "registry.redhat.io/rhosp-dev-preview/openstack-nova-compute:18.0"
+ 	edpm_neutron_sriov_image: "registry.redhat.io/rhosp-dev-preview/openstack-neutron-sriov-agent:18.0"
+ 	edpm_multipathd_image: "registry.redhat.io/rhosp-dev-preview/openstack-multipathd:18.0"
+endif::[]
 
 Set any of the above ansible variables within the `ansibleVars` sections of
 `OpenStackDataPlaneNodeSet` to customize the container image locations.

docs/assemblies/creating-the-data-plane.adoc

@@ -4,7 +4,12 @@
 :context: dataplane
 
 [role="_abstract"]
+ifeval::["{build}" != "downstream"]
 The OpenStack DataPlane consists of CentOS nodes. Use the `OpenStackDataPlaneNodeSet` custom resource definition (CRD) to create the custom resources (CRs) that define the nodes and the layout of the data plane. You can use pre-provisioned nodes, or provision bare metal nodes as part of the data plane creation and deployment process.
+endif::[]
+ifeval::["{build}" == "downstream"]
+The OpenStack DataPlane consists of RHEL nodes. Use the `OpenStackDataPlaneNodeSet` custom resource definition (CRD) to create the custom resources (CRs) that define the nodes and the layout of the data plane. You can use pre-provisioned nodes, or provision bare metal nodes as part of the data plane creation and deployment process.
+endif::[]
 
 To create and deploy a data plane, you must perform the following tasks:
 

docs/assemblies/proc_building-a-custom-ansible-runner-image.adoc

@@ -9,7 +9,12 @@ You can override the default container image used by the `ansible-runner` execut
 . Create a `Containerfile` that adds the custom content to the default image:
 +
 ----
+ifeval::["{build}" != "downstream"]
 FROM quay.io/openstack-k8s-operators/openstack-ansibleee-runner:latest
+endif::[]
+ifeval::["{build}" == "downstream"]
+FROM registry.redhat.io/rhosp-dev-preview/ee-openstack-ansible-ee-rhel9:0.1.3-5
+endif::[]
 COPY my_custom_role /usr/share/ansible/roles/my_custom_role
 ----
 
@@ -29,7 +34,12 @@ metadata:
   name: custom-service
 spec:
   label: dataplane-deployment-custom-service
+ifeval::["{build}" != "downstream"]
   openStackAnsibleEERunnerImage: quay.io/openstack-k8s-operators/openstack-ansibleee-runner:latest <1>
+endif::[]
+ifeval::["{build}" == "downstream"]
+  openStackAnsibleEERunnerImage: registry.redhat.io/rhosp-dev-preview/ee-openstack-ansible-ee-rhel9:0.1.3-5 <1>
+endif::[]
   play: |
 ----
 +

docs/assemblies/proc_creating-a-set-of-data-plane-nodes.adoc

@@ -280,17 +280,32 @@ spec:
     ansible:
       ...
       ansibleVars:
+ifeval::["{build}" != "downstream"]
         edpm_iscsid_image: "quay.io/podified-antelope-centos9/openstack-iscsid:current-podified"
-  		  edpm_logrotate_crond_image: "quay.io/podified-antelope-centos9/openstack-cron:current-podified"
-  		  edpm_ovn_controller_agent_image: "quay.io/podified-antelope-centos9/openstack-frr:current-podified"
-  		  edpm_ovn_metadata_agent_image: "quay.io/podified-antelope-centos9/openstack-neutron-metadata-agent-ovn:current-podified"
-  		  edpm_frr_image: "quay.io/podified-antelope-centos9/openstack-frr:current-podified"
-  		  edpm_ovn_bgp_agent_image: "quay.io/podified-antelope-centos9/openstack-ovn-bgp-agent:current-podified"
-  		  telemetry_node_exporter_image: "quay.io/prometheus/node-exporter:v1.5.0"
-  		  edpm_libvirt_image: "quay.io/podified-antelope-centos9/openstack-nova-libvirt:current-podified"
-  		  edpm_nova_compute_image: "quay.io/podified-antelope-centos9/openstack-nova-compute:current-podified"
-  		  edpm_neutron_sriov_image: "quay.io/podified-antelope-centos9/openstack-neutron-sriov-agent:current-podified"
-  		  edpm_multipathd_image: "quay.io/podified-antelope-centos9/openstack-multipathd:current-podified"
+        edpm_logrotate_crond_image: "quay.io/podified-antelope-centos9/openstack-cron:current-podified"
+        edpm_ovn_controller_agent_image: "quay.io/podified-antelope-centos9/openstack-frr:current-podified"
+        edpm_ovn_metadata_agent_image: "quay.io/podified-antelope-centos9/openstack-neutron-metadata-agent-ovn:current-podified"
+        edpm_frr_image: "quay.io/podified-antelope-centos9/openstack-frr:current-podified"
+        edpm_ovn_bgp_agent_image: "quay.io/podified-antelope-centos9/openstack-ovn-bgp-agent:current-podified"
+        telemetry_node_exporter_image: "quay.io/prometheus/node-exporter:v1.5.0"
+        edpm_libvirt_image: "quay.io/podified-antelope-centos9/openstack-nova-libvirt:current-podified"
+        edpm_nova_compute_image: "quay.io/podified-antelope-centos9/openstack-nova-compute:current-podified"
+        edpm_neutron_sriov_image: "quay.io/podified-antelope-centos9/openstack-neutron-sriov-agent:current-podified"
+        edpm_multipathd_image: "quay.io/podified-antelope-centos9/openstack-multipathd:current-podified"
+endif::[]
+ifeval::["{build}" == "downstream"]
+        edpm_iscsid_image: "registry.redhat.io/rhosp-dev-preview/openstack-iscsid:18.0"
+        edpm_logrotate_crond_image: "registry.redhat.io/rhosp-dev-preview/openstack-cron:18.0"
+        edpm_ovn_controller_agent_image: "registry.redhat.io/rhosp-dev-preview/openstack-frr:18.0"
+        edpm_ovn_metadata_agent_image: "registry.redhat.io/rhosp-dev-preview/openstack-neutron-metadata-agent-ovn:18.0"
+        edpm_frr_image: "registry.redhat.io/rhosp-dev-preview/openstack-frr:18.0"
+        edpm_ovn_bgp_agent_image: "registry.redhat.io/rhosp-dev-preview/openstack-ovn-bgp-agent:18.0"
+        telemetry_node_exporter_image: "quay.io/prometheus/node-exporter:v1.5.0"
+        edpm_libvirt_image: "registry.redhat.io/rhosp-dev-preview/openstack-nova-libvirt:18.0"
+        edpm_nova_compute_image: "registry.redhat.io/rhosp-dev-preview/openstack-nova-compute:18.0"
+        edpm_neutron_sriov_image: "registry.redhat.io/rhosp-dev-preview/openstack-neutron-sriov-agent:18.0"
+        edpm_multipathd_image: "registry.redhat.io/rhosp-dev-preview/openstack-multipathd:18.0"
+endif::[]
 ----
 
 . Save the `openstack-edpm.yaml` definition file.

docs/assemblies/proc_creating-the-SSH-key-secrets.adoc

@@ -4,7 +4,12 @@
 [role="_abstract"]
 You must generate SSH keys and create an SSH key `Secret` custom resource (CR) for each key to enable the following functionality:
 
+ifeval::["{build}" != "downstream"]
 * You must generate an SSH key to enable Ansible to manage the CentOS nodes on the data plane. Ansible executes commands with this user and key.
+endif::[]
+ifeval::["{build}" == "downstream"]
+* You must generate an SSH key to enable Ansible to manage the RHEL nodes on the data plane. Ansible executes commands with this user and key.
+endif::[]
 * You must generate an SSH key to enable migration of instances between Compute nodes.
 
 The `Secret` CRs are used by the data plane nodes to enable secure access between nodes.