Merge "Use openstack and groups inventory from system-config"

playbooks/roles/install-ansible/files/ansible.cfg

@@ -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

playbooks/roles/install-ansible/tasks/main.yaml

@@ -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.