diff --git a/doc/source/developer-docs/extending.rst b/doc/source/developer-docs/extending.rst index 4351d2497b..460968a37d 100644 --- a/doc/source/developer-docs/extending.rst +++ b/doc/source/developer-docs/extending.rst @@ -74,13 +74,8 @@ The variables in ``my_project/custom_stuff/playbooks/ansible.cfg`` would use env.d ----- -The OpenStack-Ansible default environment, including container and host -group mappings, resides in ``/etc/openstack_deploy/openstack_environment.yml``. - The ``/etc/openstack_deploy/env.d`` directory sources all YAML files into the -deployed environment, allowing a deployer to define additional group mappings -without having to edit the ``openstack_environment.yml`` file, which is -controlled by the OpenStack-Ansible project itself. +deployed environment, allowing a deployer to define additional group mappings. conf.d ------ diff --git a/doc/source/developer-docs/inventory.rst b/doc/source/developer-docs/inventory.rst index 02e14e962c..b3a5e1064b 100644 --- a/doc/source/developer-docs/inventory.rst +++ b/doc/source/developer-docs/inventory.rst @@ -40,9 +40,8 @@ not specified, the default is ``/etc/openstack_deploy/``. .. note:: In all versions prior to Mitaka, this argument was ``--file``. -Within the specified directory, the following files must be present: +The following file must be present in the configuration directory: - * ``openstack_environment.yml`` * ``openstack_user_config.yml`` Additionally, the configuration or environment could be spread between two diff --git a/doc/source/install-guide/app-configfiles.rst b/doc/source/install-guide/app-configfiles.rst index bf69963abf..c2d4763537 100644 --- a/doc/source/install-guide/app-configfiles.rst +++ b/doc/source/install-guide/app-configfiles.rst @@ -12,9 +12,6 @@ Appendix A. Configuration files `user_secrets.yml `_ -`openstack_environment.yml -`_ - `swift.yml `_ diff --git a/etc/openstack_deploy/openstack_environment.yml b/etc/openstack_deploy/openstack_environment.yml deleted file mode 100644 index b7ba12edca..0000000000 --- a/etc/openstack_deploy/openstack_environment.yml +++ /dev/null @@ -1,20 +0,0 @@ ---- -# Copyright 2014, 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: {} - -container_skel: {} - -physical_skel: {} diff --git a/etc/openstack_deploy/openstack_user_config.yml.example b/etc/openstack_deploy/openstack_user_config.yml.example index a63e4716f9..6607cf8435 100644 --- a/etc/openstack_deploy/openstack_user_config.yml.example +++ b/etc/openstack_deploy/openstack_user_config.yml.example @@ -165,7 +165,7 @@ # # Option: group_binds (required, string) # List of one or more Ansible groups that contain this -# network. For more information, see the openstack_environment.yml file. +# network. For more information, see the env.d YAML files. # # Option: net_name (optional, string) # Name of network for 'flat' or 'vlan' types. Only valid for these diff --git a/playbooks/inventory/dynamic_inventory.py b/playbooks/inventory/dynamic_inventory.py index 758fb3d41c..079c2b7b0e 100755 --- a/playbooks/inventory/dynamic_inventory.py +++ b/playbooks/inventory/dynamic_inventory.py @@ -928,12 +928,7 @@ def main(): '\nor \n%s/conf.d directory' % (config_path, config_path) ) - # Get the contents of the system environment YAML - environment_file = os.path.join(config_path, 'openstack_environment.yml') - - # Load existing openstack environment YAML - with open(environment_file, 'rb') as f: - environment = yaml.safe_load(f.read()) + environment = dict() # Load all YAML files found in the env.d directory env_plugins = os.path.join(config_path, 'env.d') diff --git a/releasenotes/notes/openstack_environment-754fe3c504d2aa7a.yaml b/releasenotes/notes/openstack_environment-754fe3c504d2aa7a.yaml new file mode 100644 index 0000000000..62a755a5b2 --- /dev/null +++ b/releasenotes/notes/openstack_environment-754fe3c504d2aa7a.yaml @@ -0,0 +1,6 @@ +--- +upgrade: + - The deployment configuration file ``openstack_environment.yml`` has been + removed and is no longer used in the dynamic inventory generation + process. This file was previously rendered functionally irrelevant to the + inventory generation process in the Liberty release. diff --git a/tests/roles/bootstrap-host/tasks/prepare_aio_config.yml b/tests/roles/bootstrap-host/tasks/prepare_aio_config.yml index 28a631091a..3113ae21d9 100644 --- a/tests/roles/bootstrap-host/tasks/prepare_aio_config.yml +++ b/tests/roles/bootstrap-host/tasks/prepare_aio_config.yml @@ -102,15 +102,6 @@ tags: - deploy-openstack-user-config -- name: Deploy openstack_environment - config_template: - src: "../etc/openstack_deploy/openstack_environment.yml" - dest: "/etc/openstack_deploy/openstack_environment.yml" - config_overrides: "{{ openstack_environment_overrides | default({}) }}" - config_type: "yaml" - tags: - - deploy-openstack-environment - - name: Deploy user_secrets file config_template: src: "../etc/openstack_deploy/user_secrets.yml"