diff --git a/docs/assemblies/common_configurations.adoc b/docs/assemblies/common_configurations.adoc index e31b971c7..42fd3b6fd 100644 --- a/docs/assemblies/common_configurations.adoc +++ b/docs/assemblies/common_configurations.adoc @@ -59,30 +59,52 @@ 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" - 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_iscsid_image: "quay.io/podified-antelope-centos9/openstack-iscsid + edpm_logrotate_crond_image: "quay.io/podified-antelope-centos9/openstack-cron + edpm_ovn_controller_agent_image: "quay.io/podified-antelope-centos9/openstack-ovn-controller + edpm_frr_image: "quay.io/podified-antelope-centos9/openstack-frr + edpm_ovn_bgp_agent_image: "quay.io/podified-antelope-centos9/openstack-ovn-bgp-agent + edpm_ovn_bgp_agent_local_ovn_nb_db_image: "quay.io/podified-antelope-centos9/openstack-ovn-nb-db-server + edpm_ovn_bgp_agent_local_ovn_sb_db_image: "quay.io/podified-antelope-centos9/openstack-ovn-sb-db-server + edpm_ovn_bgp_agent_local_ovn_northd_image: "quay.io/podified-antelope-centos9/openstack-ovn-northd + edpm_ovn_bgp_agent_local_ovn_controller_image: "quay.io/podified-antelope-centos9/openstack-ovn-controller + edpm_telemetry_node_exporter_image: quay.io/prometheus/node-exporter + edpm_telemetry_ceilometer_compute_image: quay.io/podified-antelope-centos9/openstack-ceilometer-compute + edpm_telemetry_ceilometer_ipmi_image: quay.io/podified-antelope-centos9/openstack-ceilometer-ipmi + edpm_nova_compute_image: "quay.io/podified-antelope-centos9/openstack-nova-compute + edpm_neutron_sriov_image: "quay.io/podified-antelope-centos9/openstack-neutron-sriov-agent + edpm_multipathd_image: "quay.io/podified-antelope-centos9/openstack-multipathd + edpm_neutron_dhcp_image: "quay.io/podified-antelope-centos9/openstack-neutron-dhcp-agent + edpm_neutron_metadata_agent_image: "quay.io/podified-antelope-centos9/openstack-neutron-metadata-agent-ovn + edpm_neutron_ovn_agent_image: "quay.io/podified-antelope-centos9/openstack-neutron-ovn-agent + edpm_swift_proxy_image: "quay.io/podified-antelope-centos9/openstack-swift-proxy-server + edpm_swift_account_image: "quay.io/podified-antelope-centos9/openstack-swift-account + edpm_swift_container_image: "quay.io/podified-antelope-centos9/openstack-swift-container + edpm_swift_object_image: "quay.io/podified-antelope-centos9/openstack-swift-object 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" + edpm_iscsid_image: "redhat.registry.io/rhoso-beta/openstack-iscsid-rhel9:18.0.0 + edpm_logrotate_crond_image: "redhat.registry.io/rhoso-beta/openstack-cron-rhel9:18.0.0 + edpm_ovn_controller_agent_image: "redhat.registry.io/rhoso-beta/openstack-ovn-controller-rhel9:18.0.0 + edpm_frr_image: "redhat.registry.io/rhoso-beta/openstack-frr-rhel9:18.0.0 + edpm_ovn_bgp_agent_image: "redhat.registry.io/rhoso-beta/openstack-ovn-bgp-agent-rhel9:18.0.0 + edpm_ovn_bgp_agent_local_ovn_nb_db_image: "redhat.registry.io/rhoso-beta/openstack-ovn-nb-db-server-rhel9:18.0.0 + edpm_ovn_bgp_agent_local_ovn_sb_db_image: "redhat.registry.io/rhoso-beta/openstack-ovn-sb-db-server-rhel9:18.0.0 + edpm_ovn_bgp_agent_local_ovn_northd_image: "redhat.registry.io/rhoso-beta/openstack-ovn-northd-rhel9:18.0.0 + edpm_ovn_bgp_agent_local_ovn_controller_image: "redhat.registry.io/rhoso-beta/openstack-ovn-controller-rhel9:18.0.0 + edpm_telemetry_node_exporter_image: redhat.registry.io/prometheus/node-exporter-rhel9:18.0.0 + edpm_telemetry_ceilometer_compute_image: redhat.registry.io/rhoso-beta/openstack-ceilometer-compute-rhel9:18.0.0 + edpm_telemetry_ceilometer_ipmi_image: redhat.registry.io/rhoso-beta/openstack-ceilometer-ipmi-rhel9:18.0.0 + edpm_nova_compute_image: "redhat.registry.io/rhoso-beta/openstack-nova-compute-rhel9:18.0.0 + edpm_neutron_sriov_image: "redhat.registry.io/rhoso-beta/openstack-neutron-sriov-agent-rhel9:18.0.0 + edpm_multipathd_image: "redhat.registry.io/rhoso-beta/openstack-multipathd-rhel9:18.0.0 + edpm_neutron_dhcp_image: "redhat.registry.io/rhoso-beta/openstack-neutron-dhcp-agent-rhel9:18.0.0 + edpm_neutron_metadata_agent_image: "redhat.registry.io/rhoso-beta/openstack-neutron-metadata-agent-ovn-rhel9:18.0.0 + edpm_neutron_ovn_agent_image: "redhat.registry.io/rhoso-beta/openstack-neutron-ovn-agent-rhel9:18.0.0 + edpm_swift_proxy_image: "redhat.registry.io/rhoso-beta/openstack-swift-proxy-server-rhel9:18.0.0 + edpm_swift_account_image: "redhat.registry.io/rhoso-beta/openstack-swift-account-rhel9:18.0.0 + edpm_swift_container_image: "redhat.registry.io/rhoso-beta/openstack-swift-container-rhel9:18.0.0 + edpm_swift_object_image: "redhat.registry.io/rhoso-beta/openstack-swift-object-rhel9:18.0.0 endif::[] Set any of the above ansible variables within the `ansibleVars` sections of diff --git a/docs/assemblies/proc_creating-a-set-of-data-plane-nodes.adoc b/docs/assemblies/proc_creating-a-set-of-data-plane-nodes.adoc index 1001887be..4a8ebb661 100644 --- a/docs/assemblies/proc_creating-a-set-of-data-plane-nodes.adoc +++ b/docs/assemblies/proc_creating-a-set-of-data-plane-nodes.adoc @@ -229,20 +229,20 @@ spec: ansibleHost: 192.168.122.100 ansibleVars: <2> ctlplane_ip: 192.168.122.100 - internal_api_ip: 172.17.0.100 + internalapi_ip: 172.17.0.100 storage_ip: 172.18.0.100 tenant_ip: 172.19.0.100 - fqdn_internal_api: edpm-compute-0.example.com + fqdn_internalapi: edpm-compute-0.example.com edpm-compute-1: hostName: edpm-compute-1 ansible: ansibleHost: 192.168.122.101 ansibleVars: ctlplane_ip: 192.168.122.101 - internal_api_ip: 172.17.0.101 + internalapi_ip: 172.17.0.101 storage_ip: 172.18.0.101 tenant_ip: 172.19.0.101 - fqdn_internal_api: edpm-compute-1.example.com + fqdn_internalapi: edpm-compute-1.example.com ---- + <1> The node definition reference, for example, `edpm-compute-0`. Each node in the node set must have a node definition.