Change Murano Glance Artifact Plugin location

Since this plugin is used only by Murano and this
plugin should be enabled by default, it's moved to
Murano settings section, which is hidden in case of
Murano is disabled.

Change-Id: I8ebac4405a1eaede18a35acbbab7b202b6aac754
Closes-Bug: #1569944
This commit is contained in:
Artur Svechnikov 2016-04-13 18:05:20 +03:00
parent 6a24d04949
commit 11f55603d7
2 changed files with 10 additions and 12 deletions

View File

@ -867,6 +867,12 @@
description: ""
weight: 10
type: "text"
murano_glance_artifacts_plugin:
value: true
label: "Enable glance artifact repository"
description: "If selected glance artifact repository will be enabled"
weight: 40
type: "checkbox"
external_mongo:
metadata:
label: "External MongoDB"
@ -946,15 +952,6 @@
message: "Murano should be enabled"
- condition: "not ('experimental' in version:feature_groups)"
action: "hide"
murano_glance_artifacts_plugin:
value: true
label: "Enable glance artifact repository"
description: "If selected glance artifact repository will be enabled"
weight: 40
type: "checkbox"
restrictions:
- condition: "settings:additional_components.murano.value == false"
message: "Murano should be enabled"
heat:
value: true
label: ""

View File

@ -125,9 +125,6 @@ class InstallationInfo(object):
'murano', None),
WhiteListRule(('additional_components', 'murano-cfapi', 'value'),
'murano-cfapi', None),
WhiteListRule(('additional_components',
'murano_glance_artifacts_plugin', 'value'),
'murano_glance_artifacts_plugin', None),
WhiteListRule(('additional_components', 'heat', 'value'),
'heat', None),
WhiteListRule(('additional_components', 'ceilometer', 'value'),
@ -137,6 +134,10 @@ class InstallationInfo(object):
WhiteListRule(('additional_components', 'ironic', 'value'),
'ironic', None),
WhiteListRule(('murano_settings',
'murano_glance_artifacts_plugin', 'value'),
'murano_glance_artifacts_plugin', None),
WhiteListRule(('workloads_collector', 'enabled', 'value'),
'workloads_collector_enabled', None),