diff options
6 files changed, 12 insertions, 53 deletions
diff --git a/ansible/roles/rancher/molecule/default/cleanup.yml b/ansible/roles/rancher/molecule/default/cleanup.yml deleted file mode 100644 index d4bf4495..00000000 --- a/ansible/roles/rancher/molecule/default/cleanup.yml +++ /dev/null @@ -1,14 +0,0 @@ ---- -- name: Cleanup host - hosts: localhost - roles: - - role: cleanup-containers - vars: - container_list: - - rancher-agent - - rancher-server - - role: cleanup-rancher - vars: - container_list_by_label: - - { 'label':'io.rancher.project.name', 'value':'healthcheck'} - - { 'label':'io.rancher.project.name', 'value':'kubernetes'} diff --git a/ansible/roles/rancher/molecule/default/molecule.yml b/ansible/roles/rancher/molecule/default/molecule.yml index b21325d4..eb7f8c19 100644 --- a/ansible/roles/rancher/molecule/default/molecule.yml +++ b/ansible/roles/rancher/molecule/default/molecule.yml @@ -13,8 +13,7 @@ platforms: override_command: false restart_policy: unless-stopped volumes: - - /var/run/docker.sock:/var/run/docker.sock - - /var/lib/rancher:/var/lib/rancher:ro + - /var/lib/docker groups: - infrastructure networks: @@ -27,12 +26,14 @@ platforms: override_command: false restart_policy: unless-stopped volumes: - - /var/run/docker.sock:/var/run/docker.sock - - /var/lib/rancher:/var/lib/rancher:ro + - /var/lib/docker + - /var/lib/rancher + - /var/lib/kubelet groups: - kubernetes networks: - name: rancher + purge_networks: true provisioner: name: ansible diff --git a/ansible/roles/rancher/molecule/default/playbook.yml b/ansible/roles/rancher/molecule/default/playbook.yml index e0ef086c..e4a7151e 100644 --- a/ansible/roles/rancher/molecule/default/playbook.yml +++ b/ansible/roles/rancher/molecule/default/playbook.yml @@ -2,7 +2,7 @@ - name: Converge rancher master hosts: infrastructure roles: - - prepare-common # molecule specific role needed here to populate cluster_ip + - prepare-common - role: rancher vars: mode: server diff --git a/ansible/roles/rancher/molecule/default/prepare.yml b/ansible/roles/rancher/molecule/default/prepare.yml index 90159c6c..d70cda43 100644 --- a/ansible/roles/rancher/molecule/default/prepare.yml +++ b/ansible/roles/rancher/molecule/default/prepare.yml @@ -1,5 +1,5 @@ --- -- name: Prepare kube nodes - hosts: kubernetes +- name: Prepare hosts + hosts: all roles: - - prepare-docker + - prepare-docker-dind diff --git a/ansible/roles/rancher/tasks/rancher_agent.yml b/ansible/roles/rancher/tasks/rancher_agent.yml index 091503c7..73d9a642 100644 --- a/ansible/roles/rancher/tasks/rancher_agent.yml +++ b/ansible/roles/rancher/tasks/rancher_agent.yml @@ -7,7 +7,6 @@ volumes: - "/var/run/docker.sock:/var/run/docker.sock" - "/var/lib/rancher:/var/lib/rancher" - auto_remove: true privileged: true vars: server_hostvars: "{{ hostvars[groups.infrastructure.0] }}" diff --git a/ansible/test/roles/prepare-common/tasks/main.yml b/ansible/test/roles/prepare-common/tasks/main.yml index 11dcbe71..909d58c9 100644 --- a/ansible/test/roles/prepare-common/tasks/main.yml +++ b/ansible/test/roles/prepare-common/tasks/main.yml @@ -1,31 +1,4 @@ --- -- name: Fetch docker host ip - block: - - name: Get docker host ip to access host where container running (as dood) - shell: | - set -o pipefail - ip route | awk '/default/ { print $3 }' - args: - executable: /bin/bash - register: ip - changed_when: false - - - name: "set docker host ip {{ ip.stdout }} for cluster_ip" - set_fact: - cluster_ip: "{{ ip.stdout }}" - when: inventory_hostname != 'localhost' - -- name: Set fact for localhost OS - block: - - name: set localhost fact - set_fact: - localhost_ansible_os_family: "{{ hostvars['localhost'].ansible_os_family }}" - - - name: debug - debug: - var: localhost_ansible_os_family - when: hostvars['localhost'].ansible_os_family is defined - -- name: debug - debug: - var: ansible_os_family
\ No newline at end of file +- name: "Set cluster_ip fact" + set_fact: + cluster_ip: "{{ ansible_default_ipv4.address }}" |