From ef44ca47c6e8d3fbda915c79630bba0db15a4c84 Mon Sep 17 00:00:00 2001 From: "chenshuai@huawei.com" Date: Wed, 6 Jan 2016 16:52:03 +0800 Subject: bugfix: remove rabbitmq codes in opencontrail role JIRA: COMPASS-253 Change-Id: I53911352eb96a15257a513ea4154f93147dd283c Signed-off-by: chenshuai@huawei.com --- .../tasks/provision/-rabbitmq-stop.yml | 30 ------ .../tasks/provision/provision-rabbitmq.yml | 104 --------------------- 2 files changed, 134 deletions(-) delete mode 100755 deploy/adapters/ansible/roles/open-contrail/tasks/provision/-rabbitmq-stop.yml delete mode 100755 deploy/adapters/ansible/roles/open-contrail/tasks/provision/provision-rabbitmq.yml (limited to 'deploy/adapters/ansible/roles/open-contrail/tasks/provision') diff --git a/deploy/adapters/ansible/roles/open-contrail/tasks/provision/-rabbitmq-stop.yml b/deploy/adapters/ansible/roles/open-contrail/tasks/provision/-rabbitmq-stop.yml deleted file mode 100755 index ec6b2fe0..00000000 --- a/deploy/adapters/ansible/roles/open-contrail/tasks/provision/-rabbitmq-stop.yml +++ /dev/null @@ -1,30 +0,0 @@ ---- -- name: 'stop rabbitmq server' - service: - name: 'rabbitmq-server' - state: 'stopped' - -- name: 'check beam process' - shell: 'ps ax | grep -v grep | grep beam' - register: beam_process - changed_when: no - ignore_errors: yes - -- name: 'kill beam processes' - shell: 'pkill -9 beam' - when: beam_process.stdout - -- name: 'check epmd process' - shell: 'ps ax | grep -v grep | grep epmd' - register: epmd_process - changed_when: no - ignore_errors: yes - -- name: 'kill epmd processes' - shell: 'pkill -9 epmd' - when: epmd_process.stdout - -- name: 'remove mnesia directory' - file: - name: '/var/lib/rabbitmq/mnesia' - state: 'absent' diff --git a/deploy/adapters/ansible/roles/open-contrail/tasks/provision/provision-rabbitmq.yml b/deploy/adapters/ansible/roles/open-contrail/tasks/provision/provision-rabbitmq.yml deleted file mode 100755 index 58037bce..00000000 --- a/deploy/adapters/ansible/roles/open-contrail/tasks/provision/provision-rabbitmq.yml +++ /dev/null @@ -1,104 +0,0 @@ ---- -#- hosts: config -# sudo: yes -# tasks: -- name: "start supervisor support service" -# sudo: True - service: - name: "supervisor-support-service" - state: "started" - - - -- name: "stop rabbitmq server via supervisor" -# sudo: True - supervisorctl: - name: "rabbitmq-server" - state: "stopped" - server_url: "unix:///tmp/supervisord_support_service.sock" - - - -- name: "-rabbitmq-stop" -# sudo: True - include: -rabbitmq-stop.yml - - - -- name: "update hosts" -# sudo: True - lineinfile: - dest: "/etc/hosts" -# line: "{{ hostvars[item]['contrail_address'] }}\t{{ hostvars[item]['ansible_hostname'] }} {{ hostvars[item]['ansible_hostname'] }}-ctrl" - line: "{{ contrail_address }}\t{{ inventory_hostname }} {{ inventory_hostname }}-ctrl" - with_items: groups['opencontrail_config'] - - - -- name: "fix up rabbitmq env" -# sudo: True - template: - src: "provision/rabbitmq-env-conf.j2" - dest: "/etc/rabbitmq/rabbitmq-env.conf" - - - -- name: "fix up rabbitmq config for single node" -# sudo: True - template: - src: "provision/rabbitmq-conf-single.j2" - dest: "/etc/rabbitmq/rabbitmq.config" - when: groups['opencontrail_config'][1] is not defined - - - -- name: fix up rabbitmq config for multi nodes -# sudo: True - template: - src: "provision/rabbitmq-conf.j2" - dest: "/etc/rabbitmq/rabbitmq.config" - when: groups['opencontrail_config'][1] is defined - - - -- name: "-rabbitmq-stop" -# sudo: True - include: -rabbitmq-stop.yml - - - -- name: "create cookie uuid temporary" -# sudo: True - local_action: - module: "template" - src: "provision/rabbitmq-cookie.j2" - dest: "/tmp/tmp-rabbitmq-cookie" - run_once: yes - - -- name: "update cookie uuid" -# sudo: True - copy: - src: "/tmp/tmp-rabbitmq-cookie" - dest: "/var/lib/rabbitmq/.erlang.cookie" - owner: "rabbitmq" - group: "rabbitmq" - mode: 0400 - - - -- name: "delete temporary cookie uuid" -# sudo: True - local_action: - module: "file" - dest: "/tmp/tmp-rabbitmq-cookie" - state: "absent" - run_once: yes - - - -- name: "start rabbitmq server" -# sudo: True - service: - name: "rabbitmq-server" - state: "started" -- cgit 1.2.3-korg