renaming {edxapp,forum}_skip_supervisor to devstack

playbooks/roles/edxapp/defaults/main.yml

@@ -459,4 +459,4 @@ worker_django_settings_module: 'aws'
 
 # Skip supervisor tasks
 # Useful when supervisor is not installed (local dev)
-edxapp_skip_supervisor: False
+devstack: False

playbooks/roles/edxapp/handlers/main.yml

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

playbooks/roles/edxapp/tasks/deploy.yml

@@ -227,7 +227,7 @@
   register: supervisor_update
   sudo_user: "{{ supervisor_service_user }}"
   changed_when: supervisor_update.stdout != ""
-  when: not edxapp_skip_supervisor
+  when: not devstack
   tags: deploy
 
 - name: edxapp | ensure edxapp has started
@@ -237,7 +237,7 @@
     config={{ supervisor_cfg }}
     name="edxapp:{{ item }}"
   sudo_user: "{{ supervisor_service_user }}"
-  when: not edxapp_skip_supervisor
+  when: not devstack
   with_items: service_variants_enabled
   tags: deploy
 
@@ -247,7 +247,7 @@
     supervisorctl_path={{ supervisor_ctl }}
     config={{ supervisor_cfg }}
     state=started
-  when: celery_worker is defined and not edxapp_skip_supervisor
+  when: celery_worker is defined and not devstack
   with_items: edxapp_workers
   sudo_user: "{{ supervisor_service_user }}"
   tags: deploy

playbooks/roles/edxapp/tasks/service_variant_config.yml

@@ -29,7 +29,7 @@
     src={{ item }}.conf.j2 dest={{ supervisor_cfg_dir }}/{{ item }}.conf
     owner={{ supervisor_user }}
   with_items: service_variants_enabled
-  when: celery_worker is not defined and not edxapp_skip_supervisor
+  when: celery_worker is not defined and not devstack
   sudo_user: "{{ supervisor_user }}"
   tags:
   - deploy
@@ -38,7 +38,7 @@
   template: >
     src=edxapp.conf.j2 dest={{ supervisor_cfg_dir }}/edxapp.conf
     owner={{ supervisor_user }}
-  when: celery_worker is not defined and not edxapp_skip_supervisor
+  when: celery_worker is not defined and not devstack
   sudo_user: "{{ supervisor_user }}"
   tags:
   - deploy
@@ -49,7 +49,7 @@
   template: >
     src=workers.conf.j2 dest={{ supervisor_cfg_dir }}/workers.conf
     owner={{ supervisor_user }}
-  when: celery_worker is defined and not edxapp_skip_supervisor
+  when: celery_worker is defined and not devstack
   sudo_user: "{{ supervisor_user }}"
   tags:
   - deploy

playbooks/roles/forum/defaults/main.yml

@@ -60,4 +60,4 @@ forum_services:
 
 # Skip supervisor tasks
 # Used in local dev where supervisor isn't installed
-forum_skip_supervisor: False
+devstack: False

playbooks/roles/forum/handlers/main.yml

@@ -5,5 +5,5 @@
     supervisorctl_path={{ supervisor_ctl }}
     config={{ supervisor_cfg }}
     state=restarted
-  when: not forum_skip_supervisor
+  when: not devstack
   tags: deploy

playbooks/roles/forum/tasks/deploy.yml

@@ -6,7 +6,7 @@
     owner={{ supervisor_user }}
     mode=0644
   sudo_user: "{{ supervisor_user }}"
-  when: not forum_skip_supervisor
+  when: not devstack
   register: forum_supervisor
   tags: deploy
 
@@ -16,7 +16,7 @@
     dest={{ forum_supervisor_wrapper }}
     mode=0755
   sudo_user: "{{ forum_user }}"
-  when: not forum_skip_supervisor
+  when: not devstack
   notify: forum | restart the forum service
   tags: deploy
 
@@ -45,7 +45,7 @@
   shell:  "{{ supervisor_ctl }} -c {{ supervisor_cfg }} update"
   register: supervisor_update
   changed_when: supervisor_update.stdout != ""
-  when: not forum_skip_supervisor
+  when: not devstack
   tags: deploy
 
 - name: forum | ensure forum is started
@@ -54,5 +54,5 @@
     supervisorctl_path={{ supervisor_ctl }}
     config={{ supervisor_cfg }}
     state=started
-  when: not forum_skip_supervisor
+  when: not devstack
   tags: deploy

playbooks/roles/forum/tasks/test.yml

@@ -3,7 +3,7 @@
 - name: forum | test that the required service are listening
   wait_for: port={{ item.port }} host={{ item.host }} timeout=30
   with_items: "{{ forum_services }}"
-  when: not forum_skip_supervisor
+  when: not devstack
   tags:
   - forum
   - test

playbooks/vagrant-devstack.yml

@@ -5,8 +5,7 @@
   vars:
     migrate_db: "yes"
     openid_workaround: True
-    edxapp_skip_supervisor: True
-    forum_skip_supervisor: True
+    devstack: True
     edx_platform_commit: 'master'
   vars_files:
     - "group_vars/all"