ansible: move all of the ansible/ directory files to the top level

There is no point in having a directory for ansible anymore. Signed-off-by: Luis Chamberlain <mcgrof@kernel.org>
mcgrof · Aug 8, 2019 · 13d3b1f · 13d3b1f
1 parent c545e46
commit 13d3b1f
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 10 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,8 @@
 *.swp
 *.o
+*.retry
+
+# You can override role specific stuff on these
+ansible/roles/*/vars/main.yml
+extra_vars.yml
+python/*.pyc
diff --git a/README.md b/README.md
@@ -141,7 +141,6 @@ Before running ansible make sure you can ssh into the hosts listed on ansible/ho
 
 ```bash
 make ansible_deps
-cd ansible/
 ansible-playbook -i hosts -l dev --extra-vars "target_linux_extra_patch=pend-v4.19.58-fixes-20190716-v2.patch" playbooks/bootlinux.yml
 ```
 

diff --git a/ansible/.gitignore b/ansible/.gitignore
diff --git a/ansible/group_vars/all → group_vars/all b/ansible/group_vars/all → group_vars/all
diff --git a/ansible/hosts → hosts b/ansible/hosts → hosts
diff --git a/ansible/playbooks/bootlinux.yml → playbooks/bootlinux.yml b/ansible/playbooks/bootlinux.yml → playbooks/bootlinux.yml
diff --git a/ansible/playbooks/devconfig.yml → playbooks/devconfig.yml b/ansible/playbooks/devconfig.yml → playbooks/devconfig.yml
diff --git a/...e/playbooks/update_ssh_config_vagrant.yml → playbooks/update_ssh_config_vagrant.yml b/...e/playbooks/update_ssh_config_vagrant.yml → playbooks/update_ssh_config_vagrant.yml
diff --git a/vagrant/kdevops_nodes.yaml b/vagrant/kdevops_nodes.yaml
@@ -76,7 +76,7 @@ vagrant_boxes:
 ansible_playbooks:
   # If this file exists you can override any ansible variable there.
   # This file is optional.
-  extra_vars: "../ansible/extra_vars.yml"
+  extra_vars: "../extra_vars.yml"
   playbooks:
-    - name: "../ansible/playbooks/update_ssh_config_vagrant.yml"
-    - name: "../ansible/playbooks/devconfig.yml"
+    - name: "../playbooks/update_ssh_config_vagrant.yml"
+    - name: "../playbooks/devconfig.yml"