1858c025b2
* version bump to 13.0.0 for mitaka release * removed suse support * removed general endpoint method, since we should be able to always specify which endpoint we need * removed fallbacks in specific_endpoint method, since this behaviour is not a very obvious one to the user and it should rather return an error than an unexpected result * dry public, internal and admin endpoint methods * removed obsolete private methods * adapted method calls for admin_endpoint in libraries/cli.rb * refactored set_endpoints_by_interface recipe to directly call address_for instead of address, since the recipe already checks for an existing attribute ..['bind_interface'] and therefore address would redirect to address_for anyways * moved the nested hash order for the public, internal and admin attributes to to be more clear and to break all existing calls to fix them during the refactoring process of all cookbooks e.g: node['openstack']['endpoints']['internal']['identity'] is now node['openstack']['endpoints']['identity']['internal'] and can be moved into the identity cookbook. This also streamlines these endpoint attributes with the bind_interface and host attributes * removed dependency on openstack-identity cookbooks by moving openrc recipe to opentack-identity (same for corrensponding specs and template) * removed address method and use the address (or hostname) defined in the endpoints hash directly (logic to set this attribute should rather be done in a wrapper (with a fitting method) instead of a static and predefined one) * removed set_endpoints_by_interface recipe since logic for defining the endpoints will be moved to wrapper cookbooks * added helper method merge_config_options for generation of config hashes used in service config templates * added template for openstack-service.conf.erb which can be used by all service cookbooks * deleted all endpoints attibutes, since these are moved to the service cookbooks for easier dependency handling Implements: blueprint cookbook-refactoring Change-Id: I0547182085eed91d05384fdd7734408a839a9a2c
49 lines
1.5 KiB
Ruby
49 lines
1.5 KiB
Ruby
# encoding: UTF-8
|
|
|
|
#
|
|
# Cookbook Name:: openstack-common
|
|
# library:: config_helpers
|
|
#
|
|
# Copyright 2016, cloudbau 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.
|
|
#
|
|
|
|
# config helper methods
|
|
module ::Openstack
|
|
# return a Mash with config options which can be used for the service config
|
|
# templates
|
|
# @param [String] service
|
|
def merge_config_options(service)
|
|
conf = deep_dup(node['openstack'][service]['conf'])
|
|
if node['openstack'][service]['conf_secrets']
|
|
conf_secrets = deep_dup(node['openstack'][service]['conf_secrets'])
|
|
else
|
|
conf_secrets = {}
|
|
end
|
|
Chef::Mixin::DeepMerge.merge(conf, conf_secrets)
|
|
end
|
|
|
|
# return a full dup of the given Mash even if nested
|
|
# @param kind_of(Mash) can be a Chef::Node::ImmutableMash and will output a
|
|
# simple Mash on all layers
|
|
def deep_dup(mash)
|
|
duplicate = mash.dup
|
|
duplicate.each_pair do |k, v|
|
|
tv = duplicate[k]
|
|
duplicate[k] = tv.is_a?(Hash) && v.is_a?(Hash) ? deep_dup(tv) : v
|
|
end
|
|
duplicate
|
|
end
|
|
end
|