openstack
/
horizon
Code Issues Proposed changes

Merge "Fix applying OPENSTACK_SERVER_DEFAULT_USER_DATA value" into stable/zed

This commit is contained in:
Zuul 2023-02-24 00:51:59 +00:00 committed by Gerrit Code Review
parent 3701f2d5cf ad778d75cf
commit 3e27d35fac
4 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
doc/source/configuration/settings.rst
View File

@ -2172,7 +2172,7 @@ LAUNCH_INSTANCE_DEFAULTS
Added the ``default_availability_zone`` option.
.. versionchanged:: 22.3.0(Zed)
.. versionchanged:: 23.0.0(Zed)
Added the ``enable_metadata``, ``enable_net_ports`` options.
@ -2281,7 +2281,7 @@ launching an instance.
enable_metadata
###############
.. versionadded:: 22.3.0(Zed)
.. versionadded:: 23.0.0(Zed)
Default: ``True``
@ -2291,7 +2291,7 @@ an instance.
enable_net_ports
################
.. versionadded:: 22.3.0(Zed)
.. versionadded:: 23.0.0(Zed)
Default: ``True``
@ -2317,7 +2317,7 @@ is specified.
OPENSTACK_SERVER_DEFAULT_USER_DATA
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
.. versionadded:: 22.3.0(Zed)
.. versionadded:: 23.0.0(Zed)
Default: ``""``

2
openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/launch-instance-model.service.js
View File

@ -252,7 +252,7 @@
});
settings.getSetting("OPENSTACK_SERVER_DEFAULT_USER_DATA").then(
function (response) {
model.newInstanceSpec.default_user_data = response.OPENSTACK_SERVER_DEFAULT_USER_DATA;
model.newInstanceSpec.default_user_data = response;
});
promise = $q.all([

10
openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/launch-instance-model.service.spec.js
View File

@ -186,8 +186,7 @@
disable_volume_snapshot: false,
default_availability_zone: 'Any'
},
DEFAULT_BOOT_SOURCE: 'image',
OPENSTACK_SERVER_DEFAULT_USER_DATA: ''
DEFAULT_BOOT_SOURCE: 'image'
};
IMAGE = {type: 'image', label: 'Image', selected: true};
VOLUME = {type: 'volume', label: 'Volume', selected: false};
@ -552,6 +551,13 @@
expect(model.newInstanceSpec.hide_create_volume).toBe(true);
});
it('should default user_data based on setting', function() {
settings.OPENSTACK_SERVER_DEFAULT_USER_DATA = 'default-data';
model.initialize(true);
scope.$apply();
expect(model.newInstanceSpec.default_user_data).toBe('default-data');
});
it('should not set availability zone if the zone list is empty', function () {
spyOn(novaApi, 'getAvailabilityZones').and.callFake(function () {
var deferred = $q.defer();

5
releasenotes/notes/fix-default-userdata-3cb75b85b1a5708f.yaml Normal file
View File

@ -0,0 +1,5 @@
---
fixes:
- Fixes the bug where an administrator could not specify default user_data
for new VMs via ``OPENSTACK_SERVER_DEFAULT_USER_DATA`` configuration
setting.