Merge "CI: Disable disk image build in seed-upgrade jobs" into stable…

…/yoga

playbooks/kayobe-seed-upgrade-base/overrides.yml.j2

@@ -28,6 +28,10 @@ pip_index_url: "http://{{ zuul_site_mirror_fqdn }}/pypi/simple"
 pip_trusted_hosts:
   - "{{ zuul_site_mirror_fqdn }}"
 
+# Disable overcloud host disk image build. The image build in Bifrost is
+# disabled via bifrost-overrides.yml.j2.
+overcloud_dib_build_host_images: False
+
 # NOTE(mgoddard): CentOS 8 removes interfaces from their bridge during ifdown,
 # and removes the bridge if there are no interfaces left. When Kayobe bounces
 # veth links plugged into the bridge, it causes the bridge which has the IP we

playbooks/kayobe-seed-upgrade-base/pre.yml

@@ -30,7 +30,8 @@
         path: "{{ previous_kayobe_config_src_dir }}/etc/kayobe/kolla/config/bifrost"
         state: "directory"
 
+    # NOTE(mgoddard): Use dib.yml, since it takes precedence over bifrost.yml.
     - name: Ensure bifrost overrides file exists
       template:
         src: bifrost-overrides.yml.j2
-        dest: "{{ previous_kayobe_config_src_dir }}/etc/kayobe/kolla/config/bifrost/bifrost.yml"
+        dest: "{{ previous_kayobe_config_src_dir }}/etc/kayobe/kolla/config/bifrost/dib.yml"

playbooks/kayobe-seed-upgrade-base/run.yml

@@ -36,7 +36,7 @@
         remote_src: true
       with_items:
         - etc/kayobe/kolla/passwords.yml
-        - etc/kayobe/kolla/config/bifrost/bifrost.yml
+        - etc/kayobe/kolla/config/bifrost/dib.yml
 
     # NOTE(mgoddard): Use the name zz-overrides.yml to ensure this takes
     # precedence over the standard config files.