Merge "Adds mixed os vars to be used with per role container image prep"

config/general_config/featureset066.yml

@@ -24,6 +24,18 @@ mixed_os: true
 
 composable_roles: true
 
+overcloud_roles_mixed:
+  - name: Controller
+    CountDefault: 1
+    tags:
+      - primary
+      - controller
+  - name: Compute
+    CountDefault: 1
+    HostnameFormatDefault: '%stackname%-compute-%index%'
+    tags:
+      - compute
+
 overcloud_roles_control:
   - name: Controller
     CountDefault: 1

config/nodes/1ctlr_1comp_mixed_os.yml

@@ -30,3 +30,18 @@ topology_map_control:
 topology_map_compute:
   Compute:
     scale: 1
+
+topology_map_mixed:
+  Controller:
+    scale: 1
+    # grow /srv to 50% of remaining disk space to store swift object content
+    growvols_args: >
+        /=8GB
+        /tmp=1GB
+        /var/log=10GB
+        /var/log/audit=2GB
+        /home=1GB
+        /var=50%
+        /srv=50%
+  Compute:
+    scale: 1

config/release/tripleo-ci/CentOS-9/promotion-testing-hash-wallaby.yml

@@ -38,6 +38,11 @@ dlrn_hash_tag: tripleo-ci-testing
 overcloud_image_url: "https://images.rdoproject.org/{{ distro_ver }}/{{ release }}/rdo_trunk/{{ promote_source }}/{{ overcloud_image }}.{{ overcloud_image_type }}"
 ipa_image_url: https://images.rdoproject.org/{{ distro_ver }}/{{ release }}/rdo_trunk/{{ promote_source }}/ironic-python-agent.tar
 
+# Mixed OS _lower vars needed for single deploy mixed OS job
+mixed_os_registry_host_8: "{{ docker_registry_host }}"
+
+mixed_os_docker_registry_namespace_8: tripleowallabycentos8
+
 # repo setup
 # optimize with mirros after we have
 # something working..  IMHO may be replaced w/ tripleo-repos setup

config/release/tripleo-ci/CentOS-9/wallaby.yml

@@ -15,6 +15,25 @@ dlrn_hash_tag: >-
 dlrn_hash_tag_newest: current
 validate_on: rdo
 
+# This file is used by both check and component jobs
+# Use content provider for check, use quay.rdo for component
+mixed_os_registry_host_8: >-
+  {% if registry_distro_lower is defined and
+  registry_distro_lower | default('') | length > 0 and
+  job.registry_ip_address_distro is defined -%}
+  {{ job.registry_ip_address_distro[registry_distro_lower] }}
+  {%- else -%}
+  quay.rdoproject.org
+  {%- endif -%}
+
+# tripleowallaby for check and tripleowallabycentos8 for component
+mixed_os_docker_registry_namespace_8: >-
+  {% if job.consumer_job | default(false) | bool -%}
+  tripleowallaby
+  {%- else -%}
+  tripleowallabycentos8
+  {%- endif -%}
+
 # job.build_container_images is defined in zuul as a
 # direct var.  adding build_container_images as tqe
 # var so that we can turn this on/off per release w/o

roles/repo-setup/tasks/tripleo-get-hash-set-fact.yml

@@ -4,7 +4,7 @@
     - name: 'Set facts for tripleo-get-hash parameters'
       set_fact:
         tgh_release: "{{ dir_release | default(release) }}"
-        tgh_os_version: "{{ distro_ver }}"
+        tgh_os_version: "{{ tgh_os_version_override | default(distro_ver) }}"
         tgh_dlrn_url: "{{ dlrn_baseurl|urlsplit('scheme') }}://{{ dlrn_baseurl|urlsplit('hostname') }}"
     - name: 'tripleo-get-hash {{ search_tag }} for {{ tgh_release }} on {{ tgh_os_version }} from {{ tgh_dlrn_url }}'
       tripleo.repos.get_hash: