From 4353d29ae004cea98d3a80ef941aaa155c84bf9a Mon Sep 17 00:00:00 2001 From: Larry Smith Jr Date: Wed, 19 Dec 2018 09:50:10 -0500 Subject: Cleaned up Vagrant and merged new commits --- tasks/debian.yml | 6 +++++- tasks/fedora.yml | 18 ++++++++++++------ tasks/rabbitmq_ha_config.yml | 31 ++++++++++++++++++++----------- tasks/redhat.yml | 17 +++++++++++------ 4 files changed, 48 insertions(+), 24 deletions(-) (limited to 'tasks') diff --git a/tasks/debian.yml b/tasks/debian.yml index f35bf55..c98ff68 100644 --- a/tasks/debian.yml +++ b/tasks/debian.yml @@ -4,12 +4,16 @@ url: "{{ rabbitmq_debian_repo_key }}" state: present become: true + register: result + until: result is successful - name: debian | adding RabbitMQ repo apt_repository: repo: "{{ rabbitmq_debian_repo }}" state: present become: true + register: result + until: result is successful - name: debian | add Rabbitmq erlang repo key apt_key: @@ -27,7 +31,7 @@ - name: debian | installing RabbitMQ server apt: - name: "{{ item }}" + name: ['rabbitmq-server'] state: present become: true with_items: diff --git a/tasks/fedora.yml b/tasks/fedora.yml index 6ac9c03..b09ced0 100644 --- a/tasks/fedora.yml +++ b/tasks/fedora.yml @@ -1,23 +1,27 @@ --- - name: fedora | installing pre-reqs dnf: - name: "{{ item }}" + name: ['wget'] state: present become: true - with_items: - - wget + register: result + until: result is successful - name: fedora | installing erlang dnf: - name: "erlang" + name: ['erlang'] state: present become: true + register: result + until: result is successful - name: fedora | adding RabbitMQ public GPG key rpm_key: key: "{{ rabbitmq_redhat_repo_key }}" state: present become: true + register: result + until: result is successful - name: fedora | downloading RabbitMQ get_url: @@ -30,12 +34,14 @@ name: "/opt/{{ rabbitmq_redhat_package }}" state: present become: true + register: result + until: result is successful - name: fedora | starting and enabling RabbitMQ service service: - name: "rabbitmq-server" + name: rabbitmq-server state: started - enabled: yes + enabled: true become: true - name: fedora | enabling the RabbitMQ Management Console diff --git a/tasks/rabbitmq_ha_config.yml b/tasks/rabbitmq_ha_config.yml index 9ebe297..cc31333 100644 --- a/tasks/rabbitmq_ha_config.yml +++ b/tasks/rabbitmq_ha_config.yml @@ -4,21 +4,30 @@ path: /usr/sbin/rabbitmqadmin register: rabbitmqadmin_check -- name: rabbitmq_ha_config | install rabbitMQ admin - shell: wget http://guest:guest@localhost:15672/cli/rabbitmqadmin +- name: rabbit_ha_config | Installing rabbitMQ admin + get_url: + url: http://guest:guest@localhost:15672/cli/rabbitmqadmin + dest: /usr/sbin/rabbitmqadmin + mode: u=rwx,g=rw,o=rw become: true + notify: restart rabbitmq-server when: not rabbitmqadmin_check['stat']['exists'] -- name: rabbitmq_ha_config | moving the rabbitMQ Admin - shell: mv rabbitmqadmin /usr/sbin - become: true - when: not rabbitmqadmin_check['stat']['exists'] +# - name: rabbitmq_ha_config | install rabbitMQ admin +# shell: wget http://guest:guest@localhost:15672/cli/rabbitmqadmin +# become: true +# when: not rabbitmqadmin_check['stat']['exists'] -- name: rabbitmq_ha_config | making executable rabbitMQ Admin - shell: chmod +x /usr/sbin/rabbitmqadmin - notify: restart rabbitmq-server - become: true - when: not rabbitmqadmin_check['stat']['exists'] +# - name: rabbitmq_ha_config | moving the rabbitMQ Admin +# shell: mv rabbitmqadmin /usr/sbin +# become: true +# when: not rabbitmqadmin_check['stat']['exists'] + +# - name: rabbitmq_ha_config | making executable rabbitMQ Admin +# shell: chmod +x /usr/sbin/rabbitmqadmin +# notify: restart rabbitmq-server +# become: true +# when: not rabbitmqadmin_check['stat']['exists'] - name: rabbitmq_ha_config | creating queue(s) command: rabbitmqadmin declare queue name={{ item['queue_name'] }} durable={{ item['durable']|lower }} --vhost={{ item['vhost'] | default('/') }} diff --git a/tasks/redhat.yml b/tasks/redhat.yml index afa714c..0c7b97a 100644 --- a/tasks/redhat.yml +++ b/tasks/redhat.yml @@ -1,24 +1,27 @@ --- - name: redhat | installing pre-reqs yum: - name: "{{ item }}" + name: ['epel-release', 'wget'] state: present become: true - with_items: - - epel-release - - wget + register: result + until: result is successful - name: redhat | installing erlang yum: - name: "erlang" + name: erlang state: present become: true + register: result + until: result is successful - name: redhat | adding RabbitMQ public GPG key rpm_key: key: "{{ rabbitmq_redhat_repo_key }}" state: present become: true + register: result + until: result is successful - name: redhat | downloading RabbitMQ get_url: @@ -31,10 +34,12 @@ name: "/opt/{{ rabbitmq_redhat_package }}" state: present become: true + register: result + until: result is successful - name: redhat | starting and enabling RabbitMQ service service: - name: "rabbitmq-server" + name: rabbitmq-server state: started enabled: yes become: true -- cgit v1.2.3 From 2cf26261f48bbd3f172b8a529df25906822ff219 Mon Sep 17 00:00:00 2001 From: Larry Smith Jr Date: Wed, 19 Dec 2018 09:52:51 -0500 Subject: First commit of refactoring --- tasks/debian.yml | 6 +++++- tasks/main.yml | 3 ++- tasks/rabbitmq_ha_config.yml | 16 ---------------- 3 files changed, 7 insertions(+), 18 deletions(-) (limited to 'tasks') diff --git a/tasks/debian.yml b/tasks/debian.yml index c98ff68..317932e 100644 --- a/tasks/debian.yml +++ b/tasks/debian.yml @@ -20,6 +20,8 @@ url: https://bintray.com/user/downloadSubjectPublicKey?username=rabbitmq-erlang state: present become: true + register: result + until: result is successful when: rabbitmq_debian_erlang_from_rabbit - name: debian | add Rabbitmq erlang repo @@ -34,8 +36,10 @@ name: ['rabbitmq-server'] state: present become: true + register: result + until: result is successful with_items: - - rabbitmq-server{{ (rabbitmq_debian_version is defined) | ternary(['=',rabbitmq_debian_version] | join(''),'')}} + - rabbitmq-server{{ (rabbitmq_debian_version is defined) | ternary(['=',rabbitmq_debian_version] | join(''),'') }} - name: debian | enabling the RabbitMQ Management Console rabbitmq_plugin: diff --git a/tasks/main.yml b/tasks/main.yml index 8905c0b..3205473 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -15,7 +15,8 @@ when: rabbitmq_config_service - name: checking to see if already clustered - stat: path=/etc/rabbitmq/clustered + stat: + path: /etc/rabbitmq/clustered become: true register: clustered diff --git a/tasks/rabbitmq_ha_config.yml b/tasks/rabbitmq_ha_config.yml index cc31333..cea301c 100644 --- a/tasks/rabbitmq_ha_config.yml +++ b/tasks/rabbitmq_ha_config.yml @@ -13,22 +13,6 @@ notify: restart rabbitmq-server when: not rabbitmqadmin_check['stat']['exists'] -# - name: rabbitmq_ha_config | install rabbitMQ admin -# shell: wget http://guest:guest@localhost:15672/cli/rabbitmqadmin -# become: true -# when: not rabbitmqadmin_check['stat']['exists'] - -# - name: rabbitmq_ha_config | moving the rabbitMQ Admin -# shell: mv rabbitmqadmin /usr/sbin -# become: true -# when: not rabbitmqadmin_check['stat']['exists'] - -# - name: rabbitmq_ha_config | making executable rabbitMQ Admin -# shell: chmod +x /usr/sbin/rabbitmqadmin -# notify: restart rabbitmq-server -# become: true -# when: not rabbitmqadmin_check['stat']['exists'] - - name: rabbitmq_ha_config | creating queue(s) command: rabbitmqadmin declare queue name={{ item['queue_name'] }} durable={{ item['durable']|lower }} --vhost={{ item['vhost'] | default('/') }} run_once: true -- cgit v1.2.3 From 9a3948928d6ef562857fa4f55dde339ab501606e Mon Sep 17 00:00:00 2001 From: Larry Smith Jr Date: Wed, 19 Dec 2018 12:06:47 -0500 Subject: Fixing missing gpg command for Debian/Ubuntu --- tasks/debian.yml | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'tasks') diff --git a/tasks/debian.yml b/tasks/debian.yml index 317932e..0a6572e 100644 --- a/tasks/debian.yml +++ b/tasks/debian.yml @@ -1,4 +1,12 @@ --- +- name: debian | Adding Pre-Reqs + apt: + name: ['gnupg2'] + state: present + become: true + register: result + until: result is successful + - name: debian | adding RabbitMQ public GPG key to the apt repo apt_key: url: "{{ rabbitmq_debian_repo_key }}" -- cgit v1.2.3 From ee7f4e7c0750e17853d1d0364c92ebd4caaea4b0 Mon Sep 17 00:00:00 2001 From: Larry Smith Jr Date: Thu, 20 Dec 2018 01:03:45 -0500 Subject: Rebased from master after PR's and cleaned up --- tasks/main.yml | 1 + 1 file changed, 1 insertion(+) (limited to 'tasks') diff --git a/tasks/main.yml b/tasks/main.yml index 3205473..1ef08f0 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -1,3 +1,4 @@ +--- # tasks file for ansible-rabbitmq - include: debian.yml when: ansible_os_family == "Debian" -- cgit v1.2.3