From dd41637548dbb4bbdb114c81d7666bc692ef363f Mon Sep 17 00:00:00 2001 From: Roger Luethi Date: Thu, 25 Oct 2018 09:26:37 +0200 Subject: [PATCH] Add openstack-orchestration::dashboard recipe Starting with Queens, upstream has moved the Orchestration (heat) dashboard from the main dashboard package into a separate package. backport: queens Change-Id: Ifb2018623bd4df250c2d3d8c5a7473f6cff94fe8 --- attributes/default.rb | 2 ++ recipes/dashboard.rb | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+) create mode 100644 recipes/dashboard.rb diff --git a/attributes/default.rb b/attributes/default.rb index 9af9bdc..1f94758 100644 --- a/attributes/default.rb +++ b/attributes/default.rb @@ -63,6 +63,7 @@ when 'rhel' default['openstack']['orchestration']['platform'] = { 'heat_common_packages' => ['openstack-heat-common'], 'heat_api_packages' => ['openstack-heat-api'], + 'heat_dashboard_packages' => ['openstack-heat-ui'], 'heat_api_service' => 'openstack-heat-api', 'heat_api_cfn_packages' => ['openstack-heat-api-cfn'], 'heat_api_cfn_service' => 'openstack-heat-api-cfn', @@ -77,6 +78,7 @@ when 'debian' default['openstack']['orchestration']['platform'] = { 'heat_common_packages' => ['heat-common'], 'heat_api_packages' => ['heat-api'], + 'heat_dashboard_packages' => ['python-heat-dashboard'], 'heat_api_service' => 'heat-api', 'heat_api_cfn_packages' => ['heat-api-cfn'], 'heat_api_cfn_service' => 'heat-api-cfn', diff --git a/recipes/dashboard.rb b/recipes/dashboard.rb new file mode 100644 index 0000000..5e9b034 --- /dev/null +++ b/recipes/dashboard.rb @@ -0,0 +1,32 @@ +# encoding: UTF-8 +# +# Cookbook Name:: openstack-orchestration +# Recipe:: dashboard +# +# Copyright 2018, x-ion Gmbh +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +class ::Chef::Recipe + include ::Openstack +end + +platform_options = node['openstack']['orchestration']['platform'] + +platform_options['heat_dashboard_packages'].each do |pkg| + package pkg do + options platform_options['package_overrides'] + action :upgrade + end +end