diff options
| author | Sachin Prabhu <sprabhu@redhat.com> | 2020-04-23 17:12:34 +0100 |
|---|---|---|
| committer | Michael Adam <obnox@samba.org> | 2020-05-05 16:22:47 +0200 |
| commit | a4121d111f1ada17184d623e4e9d2715b941304f (patch) | |
| tree | 7113bc883d9bf5af066f9a6aeab67f20b7fa3160 /vagrant | |
| parent | d396280eaa6d71546883eb0486e394c596b7334a (diff) | |
| download | samba-integration-a4121d111f1ada17184d623e4e9d2715b941304f.tar.gz samba-integration-a4121d111f1ada17184d623e4e9d2715b941304f.tar.xz samba-integration-a4121d111f1ada17184d623e4e9d2715b941304f.zip | |
Call ansible scripts on setup using ssh
This allows callers to follow the status as the commands are executed on
setup.
Signed-off-by: Sachin Prabhu <sprabhu@redhat.com>
Diffstat (limited to 'vagrant')
| -rw-r--r-- | vagrant/Makefile | 3 | ||||
| -rw-r--r-- | vagrant/roles/setup.run/tasks/main.yml | 2 | ||||
| -rw-r--r-- | vagrant/setup.run.yml | 8 |
3 files changed, 2 insertions, 11 deletions
diff --git a/vagrant/Makefile b/vagrant/Makefile index c2d8315..b7f4850 100644 --- a/vagrant/Makefile +++ b/vagrant/Makefile @@ -1,4 +1,5 @@ INVENTORY := ./vagrant_ansible_inventory +VSSH := ssh -F ansible/ssh-config-setup -i /root/.vagrant.d/insecure_private_key local: @ansible-playbook --inventory localhost, local.yml @@ -18,7 +19,7 @@ setup.test.only: @ansible-playbook --inventory=$(INVENTORY) setup.test.yml setup.cluster.only: - @ansible-playbook --inventory=$(INVENTORY) setup.run.yml + @$(VSSH) setup "make -C /home/vagrant/ansible setup.cluster" setup.cluster: setup.prep setup.test.only setup.cluster.only diff --git a/vagrant/roles/setup.run/tasks/main.yml b/vagrant/roles/setup.run/tasks/main.yml deleted file mode 100644 index 2e60b1a..0000000 --- a/vagrant/roles/setup.run/tasks/main.yml +++ /dev/null @@ -1,2 +0,0 @@ -- name: run the setup playbook on the setup machine - command: ansible-playbook -i /home/vagrant/ansible/vagrant_ansible_inventory /home/vagrant/ansible/site.yml diff --git a/vagrant/setup.run.yml b/vagrant/setup.run.yml deleted file mode 100644 index 9a31885..0000000 --- a/vagrant/setup.run.yml +++ /dev/null @@ -1,8 +0,0 @@ -# -# run the cluster creation on the setup machine -# -- hosts: setup - become: yes - become_method: sudo - roles: - - setup.run |