7b288eafbe
In past versions, upgrading OpenStack-Ansible lead to contention between
the code base and deployer customizations when env.d files were changed.
Deployers were encouraged to make their customizations, while the
project needed to sometimes adjust architecture. Detecting these
conflicts in an automated way was difficult, since the files were simple
dictionaries and lists, leaving no metadata to describe intent for the
changes.
This change modifies the dynamic inventory system to first use the
in-tree env.d directory as the base environment, then reads in files
from the /etc/openstack_deploy/env.d directory and updates existing keys
with the new values. In this way, the OSA project can modify the
environment and deployers can customize the environment without directly
manipulating the same files.
As part of this change, the env.d directory was moved in to the
playbooks/inventory directory, in order to reduce the path manipulation
done inside of the dynamic_inventory.py script. The example files were
left in the etc/openstack_deploy directory for reference.
Note that this change supports deleting elements by specifying a
empty value, such as an empty list or an empty dictionary.
When overriding, only the path to the values that changed is necessary.
For example, changing the 'is_metal' property for cinder only needs the
following in /etc/openstack_deploy/env.d/cinder.yml:
container_skel:
cinder_volumes_container:
properties:
is_metal: false
This is instead of the entirity of the container_skel dict or even the
other top-level dicts.
For AIO/gate scenarioes, the env.d copy logic has been removed, as it is
now redundant.
Change-Id: Ic637fa385fd3fec7365fb9bc5e0ff54a7f4c8bee
65 lines
1.5 KiB
YAML
65 lines
1.5 KiB
YAML
---
|
|
# Copyright 2016, Rackspace US, Inc.
|
|
#
|
|
# 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.
|
|
|
|
component_skel:
|
|
ironic_api:
|
|
belongs_to:
|
|
- ironic_all
|
|
ironic_conductor:
|
|
belongs_to:
|
|
- ironic_all
|
|
ironic_server:
|
|
belongs_to:
|
|
- ironic_servers
|
|
|
|
container_skel:
|
|
ironic_api_container:
|
|
belongs_to:
|
|
- ironic-infra_containers
|
|
contains:
|
|
- ironic_api
|
|
properties:
|
|
service_name: ironic
|
|
ironic_conductor_container:
|
|
belongs_to:
|
|
- ironic-infra_containers
|
|
contains:
|
|
- ironic_conductor
|
|
properties:
|
|
service_name: ironic
|
|
ironic_server_container:
|
|
belongs_to:
|
|
- ironic-server_containers
|
|
contains:
|
|
- ironic_server
|
|
properties:
|
|
is_metal: true
|
|
service_name: ironic
|
|
|
|
|
|
physical_skel:
|
|
ironic-infra_containers:
|
|
belongs_to:
|
|
- all_containers
|
|
ironic-infra_hosts:
|
|
belongs_to:
|
|
- hosts
|
|
ironic-server_containers:
|
|
belongs_to:
|
|
- all_containers
|
|
ironic-server_hosts:
|
|
belongs_to:
|
|
- hosts
|