Skip to content

Commit 2f5f862

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request #1375 from imatza-rh/remove-extraconfig-virt-type
[BUGFIX] Remove ExtraConfig virt_type
2 parents 910dc72 + 7605e1e commit 2f5f862

14 files changed

Lines changed: 0 additions & 72 deletions

File tree

‎scenarios/dcn_nostorage/central/config_download.yaml‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,6 @@ parameter_defaults:
4646
use_neutron: false
4747
ControllerExtraConfig:
4848
nova::availability_zone::default_schedule_zone: az-central
49-
nova::compute::libvirt::services::libvirt_virt_type: qemu
50-
nova::compute::libvirt::virt_type: qemu
51-
ComputeExtraConfig:
52-
nova::compute::libvirt::services::libvirt_virt_type: qemu
53-
nova::compute::libvirt::virt_type: qemu
5449
BarbicanSimpleCryptoGlobalDefault: true
5550
Debug: true
5651
DockerPuppetDebug: true

‎scenarios/dcn_nostorage/dcn1/config_download.yaml‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,12 +43,7 @@ parameter_defaults:
4343
- ip_address: 192.168.122.111
4444
use_neutron: false
4545
ControllerExtraConfig:
46-
nova::compute::libvirt::services::libvirt_virt_type: qemu
47-
nova::compute::libvirt::virt_type: qemu
4846
nova::availability_zone::default_schedule_zone: az-central
49-
ComputeDcn1ExtraConfig:
50-
nova::compute::libvirt::services::libvirt_virt_type: qemu
51-
nova::compute::libvirt::virt_type: qemu
5247
BarbicanSimpleCryptoGlobalDefault: true
5348
Debug: true
5449
DockerPuppetDebug: true

‎scenarios/dcn_nostorage/dcn2/config_download.yaml‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,12 +43,7 @@ parameter_defaults:
4343
- ip_address: 192.168.122.111
4444
use_neutron: false
4545
ControllerExtraConfig:
46-
nova::compute::libvirt::services::libvirt_virt_type: qemu
47-
nova::compute::libvirt::virt_type: qemu
4846
nova::availability_zone::default_schedule_zone: az-central
49-
ComputeDcn2ExtraConfig:
50-
nova::compute::libvirt::services::libvirt_virt_type: qemu
51-
nova::compute::libvirt::virt_type: qemu
5247
BarbicanSimpleCryptoGlobalDefault: true
5348
Debug: true
5449
DockerPuppetDebug: true

‎scenarios/hci/config_download.yaml‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -42,12 +42,6 @@ parameter_defaults:
4242
OVNDBsVirtualFixedIPs:
4343
- ip_address: 192.168.122.111
4444
use_neutron: false
45-
ControllerExtraConfig:
46-
nova::compute::libvirt::services::libvirt_virt_type: qemu
47-
nova::compute::libvirt::virt_type: qemu
48-
ComputeExtraConfig:
49-
nova::compute::libvirt::services::libvirt_virt_type: qemu
50-
nova::compute::libvirt::virt_type: qemu
5145
BarbicanSimpleCryptoGlobalDefault: true
5246
Debug: true
5347
DockerPuppetDebug: true

‎scenarios/uni01alpha/config_download.yaml‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,12 +47,6 @@ parameter_defaults:
4747
OVNDBsVirtualFixedIPs:
4848
- ip_address: 192.168.122.131
4949
use_neutron: false
50-
ControllerExtraConfig:
51-
nova::compute::libvirt::services::libvirt_virt_type: qemu
52-
nova::compute::libvirt::virt_type: qemu
53-
ComputeExtraConfig:
54-
nova::compute::libvirt::services::libvirt_virt_type: qemu
55-
nova::compute::libvirt::virt_type: qemu
5650
NeutronDnsDomain: 'example.com'
5751
BarbicanSimpleCryptoGlobalDefault: true
5852
SwiftEncryptionEnabled: true

‎scenarios/uni02beta/config_download.yaml‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,12 +39,6 @@ parameter_defaults:
3939
OVNDBsVirtualFixedIPs:
4040
- ip_address: 192.168.122.111
4141
use_neutron: false
42-
ControllerExtraConfig:
43-
nova::compute::libvirt::services::libvirt_virt_type: qemu
44-
nova::compute::libvirt::virt_type: qemu
45-
ComputeExtraConfig:
46-
nova::compute::libvirt::services::libvirt_virt_type: qemu
47-
nova::compute::libvirt::virt_type: qemu
4842
Debug: true
4943
DockerPuppetDebug: true
5044
ContainerCli: podman

‎scenarios/uni04delta-ipv6/config_download.yaml‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,12 +39,6 @@ parameter_defaults:
3939
OVNDBsVirtualFixedIPs:
4040
- ip_address: 2620:cf:cf:aaaa::83
4141
use_neutron: false
42-
ControllerExtraConfig:
43-
nova::compute::libvirt::services::libvirt_virt_type: qemu
44-
nova::compute::libvirt::virt_type: qemu
45-
ComputeExtraConfig:
46-
nova::compute::libvirt::services::libvirt_virt_type: qemu
47-
nova::compute::libvirt::virt_type: qemu
4842
ExtraConfig:
4943
neutron::notification_driver: 'noop'
5044
neutron::config::plugin_ml2_config:

‎scenarios/uni04delta/config_download.yaml‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,6 @@ parameter_defaults:
4040
OVNDBsVirtualFixedIPs:
4141
- ip_address: 192.168.122.111
4242
use_neutron: false
43-
ControllerExtraConfig:
44-
nova::compute::libvirt::services::libvirt_virt_type: qemu
45-
nova::compute::libvirt::virt_type: qemu
46-
ComputeExtraConfig:
47-
nova::compute::libvirt::services::libvirt_virt_type: qemu
48-
nova::compute::libvirt::virt_type: qemu
4943
ExtraConfig:
5044
neutron::notification_driver: 'noop'
5145
BarbicanSimpleCryptoGlobalDefault: true

‎scenarios/uni05epsilon/config_download_cell1.yaml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,6 @@ parameter_defaults:
6060
OVNDBsVirtualFixedIPs:
6161
- ip_address: 192.168.122.121
6262
use_neutron: false
63-
ComputeExtraConfig:
64-
nova::compute::libvirt::services::libvirt_virt_type: qemu
65-
nova::compute::libvirt::virt_type: qemu
6663
Debug: true
6764
DockerPuppetDebug: true
6865
ContainerCli: podman

‎scenarios/uni05epsilon/config_download_cell2.yaml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,6 @@ parameter_defaults:
6060
OVNDBsVirtualFixedIPs:
6161
- ip_address: 192.168.122.122
6262
use_neutron: false
63-
ComputeExtraConfig:
64-
nova::compute::libvirt::services::libvirt_virt_type: qemu
65-
nova::compute::libvirt::virt_type: qemu
6663
Debug: true
6764
DockerPuppetDebug: true
6865
ContainerCli: podman

0 commit comments

Comments
 (0)