Browse Source

Merge "Add support for DEFAULT_BOOT_SOURCE"

changes/31/828531/1
Zuul 4 months ago committed by Gerrit Code Review
parent
commit
2182b0d0da
  1. 6
      manifests/init.pp
  2. 4
      releasenotes/notes/default_boot_source-8c7b960d1213fdcf.yaml
  3. 7
      templates/local_settings.py.erb

6
manifests/init.pp

@ -517,6 +517,11 @@
# will disable the function in Horizon, direct will allow the user agent to directly
# talk to the glance-api.
#
# [*default_boot_source*]
# (optional) A default instance boot source. Allowed values are: "image",
# "snapshot", "volume" and "volume_snapshot".
# Defaults to undef
#
# DEPRECATED PARAMETERS
#
# [*enable_user_pass*]
@ -629,6 +634,7 @@ class horizon(
$password_validator_help = undef,
$customization_module = undef,
$horizon_upload_mode = undef,
$default_boot_source = undef,
# DEPRECATED PARAMETERS
$enable_user_pass = undef,
) inherits horizon::params {

4
releasenotes/notes/default_boot_source-8c7b960d1213fdcf.yaml

@ -0,0 +1,4 @@
---
features:
- |
The new ``horizon::default_boot_source`` parameter has been added.

7
templates/local_settings.py.erb

@ -1041,3 +1041,10 @@ DISALLOW_IFRAME_EMBED = <%= @disallow_iframe_embed.to_s.capitalize %>
<% if @horizon_upload_mode_real -%>
HORIZON_IMAGES_UPLOAD_MODE = "<%= @horizon_upload_mode_real %>"
<%- end -%>
# A default instance boot source. Allowed values are: "image", "snapshot",
# "volume" and "volume_snapshot"
#DEFAULT_BOOT_SOURCE = "image"
<% if @default_boot_source -%>
DEFAULT_BOOT_SOURCE = "<%= @default_boot_source %>"
<%- end -%>

Loading…
Cancel
Save