Updated restart role
diff --git a/tasks/main.yml b/tasks/main.yml index 328aff0..b8df20a 100644 --- a/tasks/main.yml +++ b/tasks/main.yml
@@ -1,31 +1,20 @@ --- # tasks file for /usr/local/google/home/friasc/apigee-workspace/apigee-opdk-role-workspace/apigee-server-restart -- block: - - name: Restarting node now - become: yes - shell: '/usr/sbin/reboot now' - async: 0 - poll: 0 - when: ansible_os_family == "RedHat" and ansible_distribution_major_version | version_compare("6", ">") +- name: Restarting node now + become: yes + shell: sleep 1 && shutdown -r "Ansible triggered reboot for Apigee configuration or maintenance" + async: 1 + poll: 0 - - name: Restarting node now - become: yes - shell: '/usr/bin/reboot now' - async: 0 - poll: 0 - when: ansible_os_family == "RedHat" and ansible_distribution_major_version | version_compare("6", ">=" )and ansible_distribution_major_version | version_compare("7", "<" ) +- name: Waiting for server to complete restarting + become: no + local_action: + module: wait_for + host: '{{ inventory_hostname }}' + state: started + delay: "{{ start_check_delay | d(15) }}" + timeout: '{{ server_restart_timeout | d(60) }}' - - name: Pausing playbook for server restart - local_action: - pause seconds=15 - - - name: Waiting for server to complete restarting - become: no - local_action: - wait_for host='{{ inventory_hostname }}' state=started delay="{{ start_check_delay | d(30) }}" timeout='{{ server_restart_timeout | d(45) }}' - - - name: Report server started - debug: - msg: "Server is now running." - - when: not ignore_restart \ No newline at end of file +- name: Report server started + debug: + msg: "Apigee node is ready."
diff --git a/tests/ansible.cfg b/tests/ansible.cfg new file mode 100644 index 0000000..90b5560 --- /dev/null +++ b/tests/ansible.cfg
@@ -0,0 +1,4 @@ +[defaults] +remove_user = friasc +roles_path = /Users/friasc/apigee-workspace/apigee-opdk-role-workspace +inventory = /Users/friasc/apigee-workspace/apigee-opdk-role-workspace/apigee-server-restart/tests/inventory \ No newline at end of file
diff --git a/tests/inventory b/tests/inventory index d18580b..9cf6a0c 100644 --- a/tests/inventory +++ b/tests/inventory
@@ -1 +1,5 @@ -localhost \ No newline at end of file +[grafana] +cf-013 ansible_host=10.142.0.19 + +[influxdb] +cf-014 ansible_host=10.142.0.20
diff --git a/tests/test.yml b/tests/test.yml index d8f1602..915d51b 100644 --- a/tests/test.yml +++ b/tests/test.yml
@@ -1,5 +1,4 @@ --- -- hosts: localhost - remote_user: root +- hosts: influxdb roles: - - /usr/local/google/home/friasc/apigee-workspace/apigee-opdk-role-workspace/apigee-server-restart \ No newline at end of file + - apigee-server-restart \ No newline at end of file