Use openstack and groups inventory from system-config

Rather than copying these out of system-config inside of
install-ansible, just point the ansible.cfg to them in the system-config
location. This way as changes come in that have group updates we don't
have to first apply them to the system.

Change-Id: I1cefd7848b7f3f1adc8fbfa080eb9831124a297b
This commit is contained in:
Monty Taylor 2018-08-16 18:51:55 -05:00
parent 92c9a7c869
commit 03d09b777e
No known key found for this signature in database
GPG Key ID: 7BAE94BC7141A594
4 changed files with 1 additions and 9 deletions

View File

@ -1,5 +1,5 @@
[defaults]
inventory=/etc/ansible/hosts/openstack.yaml,/etc/ansible/hosts/groups.yaml,/etc/ansible/hosts/emergency
inventory=/opt/system-config/inventory/openstack.yaml,/opt/system-config/inventory/groups.yaml,/etc/ansible/hosts/emergency
library=/usr/share/ansible
log_path=/var/log/ansible.log
callback_plugins=/etc/ansible/callback_plugins

View File

@ -37,14 +37,6 @@
src: ansible.cfg
dest: /etc/ansible/ansible.cfg
- name: Copy inventory config into place
loop:
- openstack.yaml
- groups.yaml
copy:
src: "{{ item }}"
dest: "/etc/ansible/hosts/{{ item }}"
# NOTE(mordred) The copy of the openstack inventory plugin from 2.6 is busted.
# It doesn't proerly deal with caching. A fix has been submitted upstream, but
# for now this is a fixed copy.