diff --git a/deployment_scripts/manifests/murano_dashboard.pp b/deployment_scripts/manifests/murano_dashboard.pp index dde089d..f41918d 100644 --- a/deployment_scripts/manifests/murano_dashboard.pp +++ b/deployment_scripts/manifests/murano_dashboard.pp @@ -2,6 +2,7 @@ notice('MURANO PLUGIN: murano_dashboard.pp') $murano_hash = hiera_hash('murano_plugin', {}) $murano_plugins = $murano_hash['plugins'] +$app_catalog_ui = hiera('app_catalog_ui', false) $repository_url = has_key($murano_hash, 'murano_repo_url') ? { true => $murano_hash['murano_repo_url'], default => 'http://storage.apps.openstack.org', @@ -15,6 +16,12 @@ if has_key($murano_plugins, 'glance_artifacts_plugin') and $murano_plugins['glan $use_glare = false } +if $app_catalog_ui { + package {'python-app-catalog-ui': + ensure => 'latest', + } +} + include ::murano::params include ::murano::client include ::horizon::params diff --git a/deployment_scripts/manifests/murano_hiera_override.pp b/deployment_scripts/manifests/murano_hiera_override.pp index 3c3b117..f9834d8 100644 --- a/deployment_scripts/manifests/murano_hiera_override.pp +++ b/deployment_scripts/manifests/murano_hiera_override.pp @@ -39,6 +39,7 @@ if $murano_plugin { $murano_cfapi_enabled = $murano_plugin['murano_cfapi'] $murano_repo_url = $murano_plugin['murano_repo_url'] $murano_glance_artifacts = $murano_plugin['murano_glance_artifacts'] + $application_catalog_ui = $murano_plugin['application_catalog_ui'] $syslog_log_facility_murano = hiera('syslog_log_facility_murano', 'LOG_LOCAL0') $default_log_levels = hiera('default_log_levels') @@ -69,6 +70,7 @@ murano_plugin: enabled: <%= @murano_glance_artifacts %> murano_cfapi_plugin: enabled: <%= @murano_cfapi_enabled %> +app_catalog_ui: <%= @application_catalog_ui %> syslog_log_facility_murano: <%= @syslog_log_facility_murano %> "murano::logging::default_log_levels": <% diff --git a/environment_config.yaml b/environment_config.yaml index 5e7db2e..345ac2e 100644 --- a/environment_config.yaml +++ b/environment_config.yaml @@ -22,6 +22,12 @@ attributes: description: "If selected glance artifact repository will be enabled" weight: 30 type: "checkbox" + application_catalog_ui: + value: true + label: "Install Application Catalog UI" + description: "This makes the Applications and Components stored in the OpenStack Application Catalog available in Cloud's Horizon UI." + weight: 32 + type: "checkbox" yaml_additional_config: description: | This field contains free form YAML to provide extra parameters.