diff --git a/scenarios/3-nodes-gitops/heat_template.yaml b/scenarios/3-nodes-gitops/heat_template.yaml index ffa42e5b..b1d0fb90 100644 --- a/scenarios/3-nodes-gitops/heat_template.yaml +++ b/scenarios/3-nodes-gitops/heat_template.yaml @@ -488,6 +488,7 @@ resources: master0: type: OS::Nova::Server + depends_on: master0-trunk0 properties: image: {get_param: [ocp_master_params, image]} flavor: {get_param: [ocp_master_params, flavor]} @@ -588,6 +589,7 @@ resources: compute0: type: OS::Nova::Server + depends_on: compute0-trunk0 properties: image: {get_param: [compute_params, image]} flavor: {get_param: [compute_params, flavor]} diff --git a/scenarios/3-nodes/heat_template.yaml b/scenarios/3-nodes/heat_template.yaml index 6e582c34..75f053a5 100644 --- a/scenarios/3-nodes/heat_template.yaml +++ b/scenarios/3-nodes/heat_template.yaml @@ -483,6 +483,7 @@ resources: master0: type: OS::Nova::Server + depends_on: master0-trunk0 properties: image: {get_param: [ocp_master_params, image]} flavor: {get_param: [ocp_master_params, flavor]} @@ -579,6 +580,7 @@ resources: compute0: type: OS::Nova::Server + depends_on: compute0-trunk0 properties: image: {get_param: [compute_params, image]} flavor: {get_param: [compute_params, flavor]} diff --git a/scenarios/campus-ha/heat_template.yaml b/scenarios/campus-ha/heat_template.yaml index ae0d01f0..ac1d2cad 100644 --- a/scenarios/campus-ha/heat_template.yaml +++ b/scenarios/campus-ha/heat_template.yaml @@ -513,6 +513,7 @@ resources: master0: type: OS::Nova::Server + depends_on: master0-trunk0 properties: image: {get_param: [ocp_master_params, image]} flavor: {get_param: [ocp_master_params, flavor]} @@ -583,6 +584,7 @@ resources: master1: type: OS::Nova::Server + depends_on: master1-trunk0 properties: image: {get_param: [ocp_master_params, image]} flavor: {get_param: [ocp_master_params, flavor]} @@ -653,6 +655,7 @@ resources: master2: type: OS::Nova::Server + depends_on: master2-trunk0 properties: image: {get_param: [ocp_master_params, image]} flavor: {get_param: [ocp_master_params, flavor]} @@ -747,6 +750,7 @@ resources: worker0: type: OS::Nova::Server + depends_on: worker0-trunk0 properties: image: {get_param: [ocp_worker_params, image]} flavor: {get_param: [ocp_worker_params, flavor]} @@ -850,6 +854,7 @@ resources: worker1: type: OS::Nova::Server + depends_on: worker1-trunk0 properties: image: {get_param: [ocp_worker_params, image]} flavor: {get_param: [ocp_worker_params, flavor]} @@ -953,6 +958,7 @@ resources: worker2: type: OS::Nova::Server + depends_on: worker2-trunk0 properties: image: {get_param: [ocp_worker_params, image]} flavor: {get_param: [ocp_worker_params, flavor]} diff --git a/scenarios/compact-4-bm/heat_template.yaml b/scenarios/compact-4-bm/heat_template.yaml index a149664e..a6fa1301 100644 --- a/scenarios/compact-4-bm/heat_template.yaml +++ b/scenarios/compact-4-bm/heat_template.yaml @@ -498,6 +498,7 @@ resources: master0: type: OS::Nova::Server + depends_on: master0-trunk0 properties: image: {get_param: [ocp_master_params, image]} flavor: {get_param: [ocp_master_params, flavor]} @@ -607,6 +608,7 @@ resources: master1: type: OS::Nova::Server + depends_on: master1-trunk0 properties: image: {get_param: [ocp_master_params, image]} flavor: {get_param: [ocp_master_params, flavor]} @@ -716,6 +718,7 @@ resources: master2: type: OS::Nova::Server + depends_on: master2-trunk0 properties: image: {get_param: [ocp_master_params, image]} flavor: {get_param: [ocp_master_params, flavor]} diff --git a/scenarios/hci/heat_template.yaml b/scenarios/hci/heat_template.yaml index e9a8bdbb..0e0555b6 100644 --- a/scenarios/hci/heat_template.yaml +++ b/scenarios/hci/heat_template.yaml @@ -467,6 +467,7 @@ resources: master0: type: OS::Nova::Server + depends_on: master0-trunk0 properties: image: {get_param: [ocp_master_params, image]} flavor: {get_param: [ocp_master_params, flavor]} @@ -549,6 +550,7 @@ resources: master1: type: OS::Nova::Server + depends_on: master1-trunk0 properties: image: {get_param: [ocp_master_params, image]} flavor: {get_param: [ocp_master_params, flavor]} @@ -631,6 +633,7 @@ resources: master2: type: OS::Nova::Server + depends_on: master2-trunk0 properties: image: {get_param: [ocp_master_params, image]} flavor: {get_param: [ocp_master_params, flavor]} @@ -744,6 +747,7 @@ resources: compute0: type: OS::Nova::Server + depends_on: compute0-trunk0 properties: image: {get_param: [compute_params, image]} flavor: {get_param: [compute_params, flavor]} @@ -849,6 +853,7 @@ resources: compute1: type: OS::Nova::Server + depends_on: compute1-trunk0 properties: image: {get_param: [compute_params, image]} flavor: {get_param: [compute_params, flavor]} @@ -954,6 +959,7 @@ resources: compute2: type: OS::Nova::Server + depends_on: compute2-trunk0 properties: image: {get_param: [compute_params, image]} flavor: {get_param: [compute_params, flavor]} diff --git a/scenarios/multi-nodeset/heat_template.yaml b/scenarios/multi-nodeset/heat_template.yaml index 11b65baf..da84db9c 100644 --- a/scenarios/multi-nodeset/heat_template.yaml +++ b/scenarios/multi-nodeset/heat_template.yaml @@ -480,6 +480,7 @@ resources: master0: type: OS::Nova::Server + depends_on: master0-trunk0 properties: image: {get_param: [ocp_master_params, image]} flavor: {get_param: [ocp_master_params, flavor]} @@ -550,6 +551,7 @@ resources: bmh0: type: OS::Nova::Server + depends_on: bmh0-trunk0 properties: flavor: {get_param: [bmh_params, flavor]} block_device_mapping_v2: @@ -615,6 +617,7 @@ resources: bmh1: type: OS::Nova::Server + depends_on: bmh1-trunk0 properties: flavor: {get_param: [bmh_params, flavor]} block_device_mapping_v2: diff --git a/scenarios/multi-ns/heat_template.yaml b/scenarios/multi-ns/heat_template.yaml index 71b00729..82955de5 100644 --- a/scenarios/multi-ns/heat_template.yaml +++ b/scenarios/multi-ns/heat_template.yaml @@ -675,6 +675,7 @@ resources: master0: type: OS::Nova::Server + depends_on: master0-trunk0 properties: image: {get_param: [ocp_master_params, image]} flavor: {get_param: [ocp_master_params, flavor]} @@ -756,6 +757,7 @@ resources: bmh-a-0: type: OS::Nova::Server + depends_on: bmh-a-0-trunk0 properties: flavor: {get_param: [bmh_params, flavor]} block_device_mapping_v2: @@ -832,6 +834,7 @@ resources: bmh-b-0: type: OS::Nova::Server + depends_on: bmh-b-0-trunk0 properties: flavor: {get_param: [bmh_params, flavor]} block_device_mapping_v2: diff --git a/scenarios/networking-lab/devstack-nxsw-vxlan/heat_template.yaml b/scenarios/networking-lab/devstack-nxsw-vxlan/heat_template.yaml index ec9cdbfb..18a975fb 100644 --- a/scenarios/networking-lab/devstack-nxsw-vxlan/heat_template.yaml +++ b/scenarios/networking-lab/devstack-nxsw-vxlan/heat_template.yaml @@ -750,6 +750,7 @@ resources: leaf01: type: OS::Nova::Server + depends_on: leaf01-trunk properties: image: {get_param: [switch_params, image]} flavor: {get_param: [switch_params, flavor]} @@ -867,6 +868,7 @@ resources: leaf02: type: OS::Nova::Server + depends_on: leaf02-trunk properties: image: {get_param: [switch_params, image]} flavor: {get_param: [switch_params, flavor]} @@ -989,6 +991,7 @@ resources: devstack: type: OS::Nova::Server + depends_on: devstack-trunk properties: image: {get_param: [devstack_params, image]} flavor: {get_param: [devstack_params, flavor]} diff --git a/scenarios/sno-2-bm-flat-vlan/heat_template.yaml b/scenarios/sno-2-bm-flat-vlan/heat_template.yaml index 90c91c0c..7e0aa7a2 100644 --- a/scenarios/sno-2-bm-flat-vlan/heat_template.yaml +++ b/scenarios/sno-2-bm-flat-vlan/heat_template.yaml @@ -488,6 +488,7 @@ resources: master0: type: OS::Nova::Server + depends_on: master0-trunk0 properties: image: {get_param: [ocp_master_params, image]} flavor: {get_param: [ocp_master_params, flavor]} diff --git a/scenarios/sno-2-bm-ipv6/heat_template.yaml b/scenarios/sno-2-bm-ipv6/heat_template.yaml index d389ff2f..4120e865 100644 --- a/scenarios/sno-2-bm-ipv6/heat_template.yaml +++ b/scenarios/sno-2-bm-ipv6/heat_template.yaml @@ -590,6 +590,7 @@ resources: master0: type: OS::Nova::Server + depends_on: master0-trunk0 properties: image: {get_param: [ocp_master_params, image]} flavor: {get_param: [ocp_master_params, flavor]} diff --git a/scenarios/sno-2-bm/heat_template.yaml b/scenarios/sno-2-bm/heat_template.yaml index b1537f36..a4f8193c 100644 --- a/scenarios/sno-2-bm/heat_template.yaml +++ b/scenarios/sno-2-bm/heat_template.yaml @@ -483,6 +483,7 @@ resources: master0: type: OS::Nova::Server + depends_on: master0-trunk0 properties: image: {get_param: [ocp_master_params, image]} flavor: {get_param: [ocp_master_params, flavor]} diff --git a/scenarios/sno-2nics-force10-10/heat_template.yaml b/scenarios/sno-2nics-force10-10/heat_template.yaml index a0db9df9..d2dc1d35 100644 --- a/scenarios/sno-2nics-force10-10/heat_template.yaml +++ b/scenarios/sno-2nics-force10-10/heat_template.yaml @@ -635,6 +635,7 @@ resources: master0: type: OS::Nova::Server + depends_on: master0-trunk0 properties: image: {get_param: [ocp_master_params, image]} flavor: {get_param: [ocp_master_params, flavor]} @@ -802,6 +803,7 @@ resources: switch: type: OS::Nova::Server + depends_on: switch-trunk properties: image: {get_param: [switch_params, image]} flavor: {get_param: [switch_params, flavor]} diff --git a/scenarios/sno-2nics-nxsw/heat_template.yaml b/scenarios/sno-2nics-nxsw/heat_template.yaml index 70157c94..1ef95066 100644 --- a/scenarios/sno-2nics-nxsw/heat_template.yaml +++ b/scenarios/sno-2nics-nxsw/heat_template.yaml @@ -647,6 +647,7 @@ resources: master0: type: OS::Nova::Server + depends_on: master0-trunk0 properties: image: {get_param: [ocp_master_params, image]} flavor: {get_param: [ocp_master_params, flavor]} @@ -760,6 +761,7 @@ resources: switch: type: OS::Nova::Server + depends_on: switch-trunk properties: image: {get_param: [switch_params, image]} flavor: {get_param: [switch_params, flavor]} diff --git a/scenarios/sno-bmh-tests-ipv6/heat_template.yaml b/scenarios/sno-bmh-tests-ipv6/heat_template.yaml index 63f08be3..6550623f 100644 --- a/scenarios/sno-bmh-tests-ipv6/heat_template.yaml +++ b/scenarios/sno-bmh-tests-ipv6/heat_template.yaml @@ -658,6 +658,7 @@ resources: master0: type: OS::Nova::Server + depends_on: master0-trunk0 properties: image: {get_param: [ocp_master_params, image]} flavor: {get_param: [ocp_master_params, flavor]} @@ -728,6 +729,7 @@ resources: bmh0: type: OS::Nova::Server + depends_on: bmh0-trunk0 properties: flavor: {get_param: [bmh_params, flavor]} block_device_mapping_v2: @@ -793,6 +795,7 @@ resources: bmh1: type: OS::Nova::Server + depends_on: bmh1-trunk0 properties: flavor: {get_param: [bmh_params, flavor]} block_device_mapping_v2: diff --git a/scenarios/sno-bmh-tests/heat_template.yaml b/scenarios/sno-bmh-tests/heat_template.yaml index 01e51c27..b658c9a3 100644 --- a/scenarios/sno-bmh-tests/heat_template.yaml +++ b/scenarios/sno-bmh-tests/heat_template.yaml @@ -606,6 +606,7 @@ resources: master0: type: OS::Nova::Server + depends_on: master0-trunk0 properties: image: {get_param: [ocp_master_params, image]} flavor: {get_param: [ocp_master_params, flavor]} @@ -676,6 +677,7 @@ resources: bmh0: type: OS::Nova::Server + depends_on: bmh0-trunk0 properties: flavor: {get_param: [bmh_params, flavor]} block_device_mapping_v2: @@ -741,6 +743,7 @@ resources: bmh1: type: OS::Nova::Server + depends_on: bmh1-trunk0 properties: flavor: {get_param: [bmh_params, flavor]} block_device_mapping_v2: @@ -810,6 +813,7 @@ resources: bmh2: type: OS::Nova::Server + depends_on: bmh2-trunk0 properties: flavor: {get_param: [bmh_params, flavor]} block_device_mapping_v2: diff --git a/scenarios/sno-nxsw/heat_template.yaml b/scenarios/sno-nxsw/heat_template.yaml index d01fe4ef..1317263e 100644 --- a/scenarios/sno-nxsw/heat_template.yaml +++ b/scenarios/sno-nxsw/heat_template.yaml @@ -634,6 +634,9 @@ resources: master0: type: OS::Nova::Server + depends_on: + - master0-trunk0 + - master0-ironic-trunk properties: image: {get_param: [ocp_master_params, image]} flavor: {get_param: [ocp_master_params, flavor]} @@ -747,6 +750,7 @@ resources: switch: type: OS::Nova::Server + depends_on: switch-trunk properties: image: {get_param: [switch_params, image]} flavor: {get_param: [switch_params, flavor]} diff --git a/scenarios/uni01alpha/heat_template.yaml b/scenarios/uni01alpha/heat_template.yaml index 70ef0597..85710f56 100644 --- a/scenarios/uni01alpha/heat_template.yaml +++ b/scenarios/uni01alpha/heat_template.yaml @@ -503,6 +503,7 @@ resources: - master0-cinder-vol0 - master0-cinder-vol1 - master0-cinder-vol2 + - master0-trunk0 type: OS::Nova::Server properties: image: {get_param: [ocp_master_params, image]} @@ -622,6 +623,7 @@ resources: - master1-cinder-vol0 - master1-cinder-vol1 - master1-cinder-vol2 + - master1-trunk0 type: OS::Nova::Server properties: image: {get_param: [ocp_master_params, image]} @@ -741,6 +743,7 @@ resources: - master2-cinder-vol0 - master2-cinder-vol1 - master2-cinder-vol2 + - master2-trunk0 type: OS::Nova::Server properties: image: {get_param: [ocp_master_params, image]} @@ -842,6 +845,7 @@ resources: compute0: type: OS::Nova::Server + depends_on: compute0-trunk0 properties: image: {get_param: [compute_params, image]} flavor: {get_param: [compute_params, flavor]} @@ -911,6 +915,7 @@ resources: compute1: type: OS::Nova::Server + depends_on: compute1-trunk0 properties: image: {get_param: [compute_params, image]} flavor: {get_param: [compute_params, flavor]} @@ -965,6 +970,7 @@ resources: networker0: type: OS::Nova::Server + depends_on: networker0-trunk0 properties: image: {get_param: [networker_params, image]} flavor: {get_param: [networker_params, flavor]} @@ -1010,6 +1016,7 @@ resources: networker1: type: OS::Nova::Server + depends_on: networker1-trunk0 properties: image: {get_param: [networker_params, image]} flavor: {get_param: [networker_params, flavor]} @@ -1055,6 +1062,7 @@ resources: networker2: type: OS::Nova::Server + depends_on: networker2-trunk0 properties: image: {get_param: [networker_params, image]} flavor: {get_param: [networker_params, flavor]} diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml index 27fc9f45..80904928 100644 --- a/zuul.d/jobs.yaml +++ b/zuul.d/jobs.yaml @@ -58,7 +58,6 @@ flavor: ci.m1.medium hotstack_enable_nova_console_poller: true hotstack_enable_nova_console_recorder: true - sushy_emulator_os_vmedia_disk_format_override: raw pre-run: - ci/playbooks/pre-deploy.yml run: