diff --git a/Vagrantfile b/Vagrantfile index 0edbedee6496dac651f4e674f27d1555784a1e0b..50c0178689fbd6ca65f3f9ff0d4fb4453dda8fbd 100755 --- a/Vagrantfile +++ b/Vagrantfile @@ -188,7 +188,7 @@ Vagrant.configure("2") do |config| subconfig.vm.provision "shell", name: "Install ansible", path: File.expand_path('../scripts/ansible/install.sh', __FILE__), run: 'once' - subconfig.vm.provision "shell", name: "ansible", inline: "/bin/sh /kubernetes-vagrant/ansible/install.sh", run: 'never' + subconfig.vm.provision "shell", name: "addHostsToEtcHosts", inline: "/bin/sh /kubernetes-vagrant/ansible/addHostsToEtcHosts.sh", run: 'never', privileged: false end vms.nodes.each do |node_hash| diff --git a/ansible/kubernetes/install.sh b/ansible/addHostsToEtcHosts.sh similarity index 99% rename from ansible/kubernetes/install.sh rename to ansible/addHostsToEtcHosts.sh index 84dd8193f07220e651557bd131ab99fedfd4ae98..5cdc525186385916b0c3a3b607292370e9ade60a 100755 --- a/ansible/kubernetes/install.sh +++ b/ansible/addHostsToEtcHosts.sh @@ -9,5 +9,4 @@ SCRIPT_DIR=$(dirname "$0") cd $SCRIPT_DIR export ANSIBLE_CONFIG=$SCRIPT_DIR/ansible.cfg - ansible-playbook $SCRIPT_DIR/hosts-from-inventory/site.yaml diff --git a/ansible/hosts-from-inventory/site.yaml b/ansible/hosts-from-inventory/site.yaml index 623fd67b393bf9a57938f593ed511e0f996fa87e..d8480693d50d243d4bf70d8e61c8adb9abdeb750 100755 --- a/ansible/hosts-from-inventory/site.yaml +++ b/ansible/hosts-from-inventory/site.yaml @@ -1,17 +1,4 @@ - hosts: all - pre_tasks: - - name: Print all available facts - debug: - var: groups['all'] - - name: Print management facts - debug: - var: hostvars['management']['ip'] - - name: Check inventory - debug: - msg: "{{ hostvars[item]['ip'] }} {{item}}" - when: hostvars[item]['ip'] is defined - with_items: - - "{{ groups['all'] }}" tasks: - name: Add the inventory into /etc/hosts become: yes diff --git a/ansible/install.sh b/ansible/install.sh deleted file mode 100755 index d33f58d010345e0f809437f26f7d63125a6e32e8..0000000000000000000000000000000000000000 --- a/ansible/install.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/bash -set -e - -# check if docker-compose is available if it is installed exist -hash docker-compose > /dev/null 2>&1 && exit 0 || true -echo Provisioning ansible... - -SCRIPT_DIR=$(dirname "$0") -cd $SCRIPT_DIR - -export ANSIBLE_CONFIG=$SCRIPT_DIR/ansible.cfg -# ansible-playbook -u $user site.yaml -ansible-playbook site.yaml --extra-vars "$1" \ No newline at end of file