diff options
| author | Michael Adam <obnox@samba.org> | 2020-03-23 23:51:31 +0100 |
|---|---|---|
| committer | Michael Adam <obnox@samba.org> | 2020-03-25 22:32:23 +0100 |
| commit | 6f3f4f3fad128200812000ec1d8837c59caac109 (patch) | |
| tree | 0024bedcb8154dc6621b9bde506e63a34729415f | |
| parent | c1782e6a14fb64aab13a31fa0c513d6b2a9c5dac (diff) | |
| download | samba-integration-6f3f4f3fad128200812000ec1d8837c59caac109.tar.gz samba-integration-6f3f4f3fad128200812000ec1d8837c59caac109.tar.xz samba-integration-6f3f4f3fad128200812000ec1d8837c59caac109.zip | |
Move the creation of the cluster to the setup machine
Signed-off-by: Michael Adam <obnox@samba.org>
| -rw-r--r-- | vagrant/Makefile | 5 | ||||
| -rw-r--r-- | vagrant/ansible/cluster-vars.yml (renamed from vagrant/cluster-vars.yml) | 0 | ||||
| -rw-r--r-- | vagrant/ansible/roles/node.setup/tasks/main.yml (renamed from vagrant/roles/node.setup/tasks/main.yml) | 0 | ||||
| -rw-r--r-- | vagrant/ansible/roles/node.test/tasks/main.yml | 2 | ||||
| -rw-r--r-- | vagrant/ansible/setup-cluster.yml (renamed from vagrant/site.yml) | 2 | ||||
| -rw-r--r-- | vagrant/ansible/test.yml | 5 | ||||
| -rw-r--r-- | vagrant/roles/setup.run/tasks/main.yml | 5 | ||||
| -rw-r--r-- | vagrant/setup.run.yml | 8 |
8 files changed, 25 insertions, 2 deletions
diff --git a/vagrant/Makefile b/vagrant/Makefile index fc9eebe..921a148 100644 --- a/vagrant/Makefile +++ b/vagrant/Makefile @@ -6,4 +6,7 @@ local: setup.prep: local @ansible-playbook --inventory=$(INVENTORY) setup.prep.yml -.PHONY: local setup.prep +setup.cluster: setup.prep + @ansible-playbook --inventory=$(INVENTORY) setup.run.yml + +.PHONY: local setup.prep setup.cluster diff --git a/vagrant/cluster-vars.yml b/vagrant/ansible/cluster-vars.yml index 35bd20f..35bd20f 100644 --- a/vagrant/cluster-vars.yml +++ b/vagrant/ansible/cluster-vars.yml diff --git a/vagrant/roles/node.setup/tasks/main.yml b/vagrant/ansible/roles/node.setup/tasks/main.yml index ec3f880..ec3f880 100644 --- a/vagrant/roles/node.setup/tasks/main.yml +++ b/vagrant/ansible/roles/node.setup/tasks/main.yml diff --git a/vagrant/ansible/roles/node.test/tasks/main.yml b/vagrant/ansible/roles/node.test/tasks/main.yml new file mode 100644 index 0000000..962b368 --- /dev/null +++ b/vagrant/ansible/roles/node.test/tasks/main.yml @@ -0,0 +1,2 @@ +- name: Test host reachability + command: hostname diff --git a/vagrant/site.yml b/vagrant/ansible/setup-cluster.yml index 0b88f1e..e3fdd09 100644 --- a/vagrant/site.yml +++ b/vagrant/ansible/setup-cluster.yml @@ -1,4 +1,4 @@ -- hosts: all +- hosts: cluster become: yes become_method: sudo vars_files: diff --git a/vagrant/ansible/test.yml b/vagrant/ansible/test.yml new file mode 100644 index 0000000..5260926 --- /dev/null +++ b/vagrant/ansible/test.yml @@ -0,0 +1,5 @@ +- hosts: cluster + become: yes + become_method: sudo + roles: + - node.test diff --git a/vagrant/roles/setup.run/tasks/main.yml b/vagrant/roles/setup.run/tasks/main.yml new file mode 100644 index 0000000..42e9b7b --- /dev/null +++ b/vagrant/roles/setup.run/tasks/main.yml @@ -0,0 +1,5 @@ +- name: test playbook node connectivity on the setup machine + command: ansible-playbook -i /home/vagrant/ansible/vagrant_ansible_inventory /home/vagrant/ansible/test.yml + +- name: run the setup playbook on the setup machine + command: ansible-playbook -i /home/vagrant/ansible/vagrant_ansible_inventory /home/vagrant/ansible/setup-cluster.yml diff --git a/vagrant/setup.run.yml b/vagrant/setup.run.yml new file mode 100644 index 0000000..9a31885 --- /dev/null +++ b/vagrant/setup.run.yml @@ -0,0 +1,8 @@ +# +# run the cluster creation on the setup machine +# +- hosts: setup + become: yes + become_method: sudo + roles: + - setup.run |