Merge pull request #698 from edx/jarv/stop-services-role

Jarv/stop services role

playbooks/roles/certs/handlers/main.yml

@@ -20,4 +20,4 @@
     supervisorctl_path={{ supervisor_ctl }}
     config={{ supervisor_cfg }}
     state=restarted
-  when: start_services and certs_installed is defined
+  when: certs_installed is defined

playbooks/roles/certs/tasks/deploy.yml

@@ -58,7 +58,6 @@
   register: supervisor_update
   sudo_user: "{{ supervisor_service_user }}"
   changed_when: supervisor_update.stdout != ""
-  when: start_services
 
 - name: ensure certs has started
   supervisorctl_local: >
@@ -67,7 +66,6 @@
     config={{ supervisor_cfg }}
     state=started
   sudo_user: "{{ supervisor_service_user }}"
-  when: start_services
 
 - name: create a symlink for venv python
   file: >

playbooks/roles/common/defaults/main.yml

@@ -49,6 +49,3 @@ common_git_ppa: "ppa:git-core/ppa"
 # Skip supervisor tasks
 # Useful when supervisor is not installed (local dev)
 devstack: False
-
-# By default start services on ansible runs
-start_services: True

playbooks/roles/discern/handlers/main.yml

@@ -5,7 +5,7 @@
     supervisorctl_path={{ supervisor_ctl }}
     config={{ supervisor_cfg }}
     state=restarted
-  when: start_services and discern_installed is defined
+  when: discern_installed is defined
   with_items:
   - discern
   - discern_celery

playbooks/roles/discern/tasks/deploy.yml

@@ -103,7 +103,6 @@
   shell:  "{{ supervisor_ctl }} -c {{ supervisor_cfg }} update"
   register: supervisor_update
   sudo_user: "{{ supervisor_service_user }}"
-  when: start_services
   changed_when: supervisor_update.stdout != ""
 
 - name: ensure discern, discern_celery has started
@@ -112,7 +111,6 @@
     supervisorctl_path={{ supervisor_ctl }}
     config={{ supervisor_cfg }}
     state=started
-  when: start_services
   with_items:
   - discern
   - discern_celery

playbooks/roles/edxapp/handlers/main.yml

@@ -5,7 +5,7 @@
     supervisorctl_path={{ supervisor_ctl }}
     config={{ supervisor_cfg }}
     name="edxapp:{{ item }}"
-  when: start_services and edxapp_installed is defined and celery_worker is not defined and not devstack
+  when: edxapp_installed is defined and celery_worker is not defined and not devstack
   sudo_user: "{{ supervisor_service_user }}"
   with_items: service_variants_enabled
 
@@ -15,6 +15,6 @@
     supervisorctl_path={{ supervisor_ctl }}
     config={{ supervisor_cfg }}
     state=restarted
-  when: start_services and edxapp_installed is defined and celery_worker is defined and not devstack
+  when: edxapp_installed is defined and celery_worker is defined and not devstack
   with_items: edxapp_workers
   sudo_user: "{{ common_web_user }}"

playbooks/roles/edxapp/tasks/deploy.yml

@@ -274,7 +274,7 @@
   register: supervisor_update
   sudo_user: "{{ supervisor_service_user }}"
   changed_when: supervisor_update.stdout != ""
-  when: start_services and not devstack
+  when: not devstack
 
 - name: ensure edxapp has started
   supervisorctl_local: >
@@ -283,7 +283,7 @@
     config={{ supervisor_cfg }}
     name="edxapp:{{ item }}"
   sudo_user: "{{ supervisor_service_user }}"
-  when: start_services and celery_worker is not defined and not devstack
+  when: celery_worker is not defined and not devstack
   with_items: service_variants_enabled
 
 - name: ensure edxapp_workers has started
@@ -292,7 +292,7 @@
     supervisorctl_path={{ supervisor_ctl }}
     config={{ supervisor_cfg }}
     state=started
-  when: start_services and celery_worker is defined and not devstack
+  when: celery_worker is defined and not devstack
   with_items: edxapp_workers
   sudo_user: "{{ supervisor_service_user }}"
 

playbooks/roles/forum/handlers/main.yml

@@ -5,4 +5,4 @@
     supervisorctl_path={{ supervisor_ctl }}
     config={{ supervisor_cfg }}
     state=restarted
-  when: start_services and forum_installed is defined and not devstack
+  when: forum_installed is defined and not devstack

playbooks/roles/forum/tasks/deploy.yml

@@ -41,7 +41,7 @@
   shell:  "{{ supervisor_ctl }} -c {{ supervisor_cfg }} update"
   register: supervisor_update
   changed_when: supervisor_update.stdout != ""
-  when: start_services and not devstack
+  when: not devstack
 
 - name: ensure forum is started
   supervisorctl_local: >
@@ -49,9 +49,8 @@
     supervisorctl_path={{ supervisor_ctl }}
     config={{ supervisor_cfg }}
     state=started
-  when: start_services and not devstack
+  when: not devstack
 
 - include: test.yml tags=deploy
-  when: start_services
 
 - set_fact: forum_installed=true

playbooks/roles/nginx/tasks/main.yml

@@ -112,8 +112,3 @@
 # any reason, this will ensure that it is started up again.
 - name: make sure nginx has started
   service: name=nginx state=started
-  when: start_services
-
-- name: make sure nginx has stopped
-  service: name=nginx state=stopped
-  when: not start_services

playbooks/roles/ora/handlers/main.yml

@@ -5,7 +5,7 @@
     supervisorctl_path={{ supervisor_ctl }}
     config={{ supervisor_cfg }}
     state=restarted
-  when: start_services and ora_installed is defined and not devstack
+  when: ora_installed is defined and not devstack
 
 - name: restart ora_celery
   supervisorctl_local: >
@@ -13,4 +13,4 @@
     supervisorctl_path={{ supervisor_ctl }}
     config={{ supervisor_cfg }}
     state=restarted
-  when: start_services and ora_installed is defined and not devstack
+  when: ora_installed is defined and not devstack

playbooks/roles/ora/tasks/deploy.yml

@@ -86,7 +86,7 @@
 - name: update supervisor configuration
   shell:  "{{ supervisor_ctl }} -c {{ supervisor_cfg }} update"
   register: supervisor_update
-  when: start_services and not devstack
+  when: not devstack
   changed_when: supervisor_update.stdout != ""
 
 - name: ensure ora is started
@@ -95,7 +95,7 @@
     supervisorctl_path={{ supervisor_ctl }}
     config={{ supervisor_cfg }}
     state=started
-  when: start_services and not devstack
+  when: not devstack
 
 - name: ensure ora_celery is started
   supervisorctl_local: >
@@ -103,6 +103,6 @@
     supervisorctl_path={{ supervisor_ctl }}
     config={{ supervisor_cfg }}
     state=started
-  when: start_services and not devstack
+  when: not devstack
 
 - set_fact: ora_installed=true

playbooks/roles/rabbitmq/tasks/main.yml

@@ -103,7 +103,3 @@
   file: >
     path=/usr/local/bin/rabbitmqadmin owner=root
     group=root mode=0655
-
-- name: stop rabbit nodes
-  service: name=rabbitmq-server state=restarted
-  when: not start_services

playbooks/roles/xqueue/handlers/main.yml

@@ -4,7 +4,7 @@
     supervisorctl_path={{ supervisor_ctl }}
     config={{ supervisor_cfg }}
     state=restarted
-  when: start_services and xqueue_installed is defined
+  when: xqueue_installed is defined
   with_items:
   - xqueue
   - xqueue_consumer

playbooks/roles/xqueue/tasks/deploy.yml

@@ -63,7 +63,6 @@
   shell:  "{{ supervisor_ctl }} -c {{ supervisor_cfg }} update"
   register: supervisor_update
   changed_when: supervisor_update.stdout != ""
-  when: start_services
 
 - name: ensure xqueue, consumer is running
   supervisorctl_local: >
@@ -71,7 +70,6 @@
     supervisorctl_path={{ supervisor_ctl }}
     config={{ supervisor_cfg }}
     state=started
-  when: start_services
   with_items:
   - xqueue
   - xqueue_consumer

playbooks/roles/xserver/tasks/deploy.yml

@@ -54,7 +54,6 @@
 - name: update supervisor configuration
   shell:  "{{ supervisor_ctl }} -c {{ supervisor_cfg }} update"
   register: supervisor_update
-  when: start_services
   changed_when: supervisor_update.stdout != ""
 
 - name: ensure xserver is started
@@ -63,7 +62,6 @@
     supervisorctl_path={{ supervisor_ctl }}
     config={{ supervisor_cfg }}
     state=started
-  when: start_services
 
 - name: create a symlink for venv python
   file: >

util/jenkins/ansible-provision.sh

@@ -92,7 +92,6 @@ cd playbooks/edx-east
 
 cat << EOF > $extra_vars
 ---
-start_services: $start_services
 ansible_ssh_private_key_file: /var/lib/jenkins/${keypair}.pem
 NGINX_ENABLE_SSL: True
 NGINX_SSL_CERTIFICATE: '/var/lib/jenkins/star.sandbox.edx.org.crt'