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
|
||
|---|---|---|
| doc | ||
| etc | ||
| playbooks | ||
| releasenotes | ||
| scripts | ||
| tests | ||
| .gitignore | ||
| .gitreview | ||
| ansible-role-requirements.yml | ||
| ansible-role-requirements.yml.example | ||
| global-requirement-pins.txt | ||
| LICENSE.txt | ||
| README.rst | ||
| requirements.txt | ||
| setup.cfg | ||
| setup.py | ||
| test-requirements.txt | ||
| tox.ini | ||
OpenStack-Ansible
OpenStack-Ansible is an official OpenStack project which aims to deploy production environments from source in a way that makes it scalable while also being simple to operate, upgrade, and grow.
For an overview of the mission, repositories and related Wiki home page, please see the formal Home Page for the project.
For those looking to test OpenStack-Ansible using an All-In-One (AIO) build, please see the Quick Start guide.
For more detailed Installation and Operator documentation, please see the Install Guide.
If OpenStack-Ansible is missing something you'd like to see included, then we encourage you to see the Developer Documentation for more details on how you can get involved.
Developers wishing to work on the OpenStack-Ansible project should always base their work on the latest code, available from the master GIT repository at Source.
If you have some questions, or would like some assistance with
achieving your goals, then please feel free to reach out to us on the OpenStack Mailing Lists
(particularly openstack-operators or openstack-dev) or on IRC in
#openstack-ansible on the freenode network.