799029519b
* added endpoint attributes (moved from common) * removed qpid as a messaging option (can be incuded in a wrapper) * removed os-bare-metal dependencies * deleted default attributes from nova.conf.rb originated in openstack-common * removed fedora and suse as supported platform * adapted optimized endpoint logic * removed rubocop exceptions in recipes and regenerated the .rubocop_todo.yaml containing all remaining exceptions * added versionbumb for refactored os-identity and common * moved version up to 13.0.0 for mitaka release * adapted the specs (unit tests) to work again * refactored spec_helper.rb method "expect_creates_api_paste" * added new logic into templates/default/nova.conf.erb * refactored attributes throughout all recipes that were connected to the attributes used for the nova.conf.erb template to adapt the new template attribute syntax * moved all attributes from attributes/default.rb that were used in nova_conf.erb to attributes/nova_conf.rb * refactored attributes to fit upcomming template logic * refactored recipes/nova_common.rb to fit upcomming template logic * removed all attributes from default.rb and nova.conf.erb which are set as default in attributes, openstack doc and used to render the template * removed nova-network as a supported config option Depends-On: I9cc1b5cc069987ac83e064322c2291772505ff5f Depends-On: Ifa5a7f4e1df47a3961976e64f654224864c3dcb4 Depends-On: I3262b2e6f792f37c32a446e6567790b82bdd4613 Depends-On: I0547182085eed91d05384fdd7734408a839a9a2c Implements: blueprint cookbook-refactoring Change-Id: I9ac9eeb29ab27f31394830e4b6f999d5870cc0e4
55 lines
1.6 KiB
Ruby
55 lines
1.6 KiB
Ruby
# encoding: UTF-8
|
|
#
|
|
# Cookbook Name:: openstack-compute
|
|
# Recipe:: vncproxy
|
|
#
|
|
# Copyright 2012, Rackspace US, Inc.
|
|
# Copyright 2013, Craig Tracey <craigtracey@gmail.com>
|
|
#
|
|
# 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.
|
|
#
|
|
|
|
include_recipe 'openstack-compute::nova-common'
|
|
|
|
platform_options = node['openstack']['compute']['platform']
|
|
|
|
platform_options['compute_vncproxy_packages'].each do |pkg|
|
|
package pkg do
|
|
options platform_options['package_overrides']
|
|
action :upgrade
|
|
end
|
|
end
|
|
|
|
# required for vnc console authentication
|
|
platform_options['compute_vncproxy_consoleauth_packages'].each do |pkg|
|
|
package pkg do
|
|
action :upgrade
|
|
end
|
|
end
|
|
|
|
proxy_service = platform_options['compute_vncproxy_service']
|
|
|
|
service proxy_service do
|
|
service_name proxy_service
|
|
supports status: true, restart: true
|
|
action [:enable, :start]
|
|
subscribes :restart, 'template[/etc/nova/nova.conf]'
|
|
end
|
|
|
|
service 'nova-consoleauth' do
|
|
service_name platform_options['compute_vncproxy_consoleauth_service']
|
|
supports status: true, restart: true
|
|
action [:enable, :start]
|
|
subscribes :restart, 'template[/etc/nova/nova.conf]'
|
|
end
|