Remove redundant setting of DEFAULT_IMAGE_NAME(_FILE)
This is a follow up for change I1a6468fbfa51eedec0ab91d73f313784a9a618a0 which had residue from an earlier PS that set DEFAULT_IMAGE_NAME and DEFAULT_IMAGE_FILE_NAME intended to override project.vars. The project.vars approach did not work because we needed to set IMAGE_URLS as well and the devstack-tempest ancestor job sets IMAGE_URLS which overrides project.vars. The approach was changed to use YAML anchors instead of project.vars to reduce duplication, which made the setting of DEFAULT_IMAGE_NAME and DEFAULT_IMAGE_FILE_NAME in nova-next redundant as the default values from Devstack can be used. This removes the setting of DEFAULT_IMAGE_NAME and DEFAULT_IMAGE_FILE_NAME in nova-next. Change-Id: I3929b6c55d77575a6c0bd205f933cc2a690db91e
This commit is contained in:
parent
326279962b
commit
07d4138a43
|
@ -508,8 +508,6 @@
|
|||
devstack_localrc:
|
||||
# For nested virt
|
||||
LIBVIRT_TYPE: kvm
|
||||
DEFAULT_IMAGE_NAME: cirros-0.6.2-x86_64-disk
|
||||
DEFAULT_IMAGE_FILE_NAME: cirros-0.6.2-x86_64-disk.img
|
||||
Q_AGENT: openvswitch
|
||||
Q_ML2_TENANT_NETWORK_TYPE: vxlan
|
||||
Q_ML2_PLUGIN_MECHANISM_DRIVERS: openvswitch
|
||||
|
|
Loading…
Reference in New Issue