openstack/openstack-ansible
Code Issues Proposed changes

Merge "Remove support for ~/.openstack_deploy/"

Browse Source
This commit is contained in:
Jenkins 2015-03-30 09:22:05 +00:00 committed by Gerrit Code Review
commit 1fc78efeee
3 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README.rst
View File

@ -27,8 +27,8 @@ Basic Setup:
version: master version: master
2. Run the ``./scripts/bootstrap-ansible.sh`` script, which will install, pip, ansible 1.8.x, all of the required python packages, and bring in any third part ansible roles that you may want to add to the deployment. 2. Run the ``./scripts/bootstrap-ansible.sh`` script, which will install, pip, ansible 1.8.x, all of the required python packages, and bring in any third part ansible roles that you may want to add to the deployment.
3. Copy the ``etc/openstack_deploy`` directory to ``/etc/openstack_deploy`` or if you are executing all of this as an unprivileged user you can add the ``openstack_deploy`` bits into your home directory as ``${HOME}/.openstack_deploy``. 3. Copy the ``etc/openstack_deploy`` directory to ``/etc/openstack_deploy``.
4. Fill in your ``openstack_deploy/openstack_user_config.yml``, ``openstack_deploy/user_secrets.yml`` and ``openstack_deploy/user_variables.yml`` files which you've just copied to your ``/etc/`` directory or your ``${HOME}`` folder. 4. Fill in your ``openstack_deploy/openstack_user_config.yml``, ``openstack_deploy/user_secrets.yml`` and ``openstack_deploy/user_variables.yml`` files which you've just copied to your ``/etc/`` directory.
5. Generate all of your random passwords executing ``scripts/pw-token-gen.py --file /etc/openstack_deploy/user_secrets.yml``. 5. Generate all of your random passwords executing ``scripts/pw-token-gen.py --file /etc/openstack_deploy/user_secrets.yml``.
6. Accomplish all of the host networking that you want to use within the deployment. See the ``etc/network`` directory in this repository for an example network setup. 6. Accomplish all of the host networking that you want to use within the deployment. See the ``etc/network`` directory in this repository for an example network setup.
7. When ready change to the ``playbooks/`` directory and execute your desired plays. IE: 7. When ready change to the ``playbooks/`` directory and execute your desired plays. IE:

2
playbooks/inventory/dynamic_inventory.py
View File

@ -697,7 +697,6 @@ def file_find(pass_exception=False, user_file=None):
If no file is found the system will exit. If no file is found the system will exit.
The file lookup will be done in the following directories: The file lookup will be done in the following directories:
/etc/openstack_deploy/ /etc/openstack_deploy/
$HOME/openstack_deploy/
$(pwd)/openstack_deploy/ $(pwd)/openstack_deploy/
:param pass_exception: ``bol`` :param pass_exception: ``bol``
@ -705,7 +704,6 @@ def file_find(pass_exception=False, user_file=None):
""" """
file_check = [ file_check = [
os.path.join('/etc', 'openstack_deploy'), os.path.join('/etc', 'openstack_deploy'),
os.path.join(os.environ.get('HOME'), 'openstack_deploy')
] ]
if user_file is not None: if user_file is not None:

4
scripts/inventory-manage.py
View File

@ -27,7 +27,6 @@ def file_find(filename, user_file=None, pass_exception=False):
If no file is found the system will exit. If no file is found the system will exit.
The file lookup will be done in the following directories: The file lookup will be done in the following directories:
/etc/openstack_deploy/ /etc/openstack_deploy/
$HOME/openstack_deploy/
$(pwd)/openstack_deploy/ $(pwd)/openstack_deploy/
:param filename: ``str`` Name of the file to find :param filename: ``str`` Name of the file to find
@ -37,9 +36,6 @@ def file_find(filename, user_file=None, pass_exception=False):
os.path.join( os.path.join(
'/etc', 'openstack_deploy', filename '/etc', 'openstack_deploy', filename
), ),
os.path.join(
os.environ.get('HOME'), 'openstack_deploy', filename
),
os.path.join( os.path.join(
os.getcwd(), filename os.getcwd(), filename
) )