diff options
| author | Zuul <zuul@review.opendev.org> | 2023-01-27 15:38:33 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2023-01-27 15:38:33 +0000 |
| commit | 01e6e6c113348341d50848c593d55a6c6a02ebea (patch) | |
| tree | 325ae521a3b085ca508f21912f5a528935d99371 /openstack_dashboard | |
| parent | 501d446e1e2657e8303a40a4198cf513c5cb867b (diff) | |
| parent | c8ee8c1965b280e24fb6266cbb2523230fea605f (diff) | |
| download | horizon-01e6e6c113348341d50848c593d55a6c6a02ebea.tar.gz | |
Merge "Fix applying OPENSTACK_SERVER_DEFAULT_USER_DATA value"
Diffstat (limited to 'openstack_dashboard')
2 files changed, 9 insertions, 3 deletions
diff --git a/openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/launch-instance-model.service.js b/openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/launch-instance-model.service.js index c38d75bc4..0c22a9a65 100644 --- a/openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/launch-instance-model.service.js +++ b/openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/launch-instance-model.service.js @@ -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([ diff --git a/openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/launch-instance-model.service.spec.js b/openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/launch-instance-model.service.spec.js index 27a580698..52f1f2e76 100644 --- a/openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/launch-instance-model.service.spec.js +++ b/openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/launch-instance-model.service.spec.js @@ -188,8 +188,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}; @@ -557,6 +556,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(); |