A bit more work on variables

defaults/main.yml

@@ -26,6 +26,8 @@ barbican_api_program_name: barbican-api
 barbican_keystone_listener_program_name: barbican-keystone-listener
 barbican_worker_program_name: barbican-worker
 barbican_retry_program_name: barbican-retry
+barbican_uwsgi_program_name: uwsgi
+barbican_uwsgi_options: "--master --die-on-term --emperor {{ barbican_vassals_directory }}"
 
 barbican_service_name: barbican
 barbican_service_user_name: barbican

tasks/main.yml

@@ -25,10 +25,6 @@
 
 - include: post-install.yml
 
-#- include: ssl.yml
-
-#- include: apache.yml
-
 - include: upstart-init.yml
 
 - include: database-setup.yml
@@ -44,7 +40,7 @@
     name: "{{ item }}"
     state: "restarted"
   with_items:
-    - "{{ barbican_api_program_name }}"
+    - "{{ barbican_uwsgi_program_name }}"
 
 - name: Flush handlers
   meta: flush_handlers

tasks/upstart-init.yml

@@ -15,8 +15,8 @@
 
 - include: upstart-common-init.yml
   vars:
-    program_name: "uwsgi"
-    program_config_options: "--master --die-on-term --emperor {{ barbican_vassals_directory }}"
+    program_name: "{{ barbican_uwsgi_program_name }}"
+    program_config_options: "{{ barbican_uwsgi_options }}"
     service_name: "{{ barbican_service_name }}"
     system_user: "{{ barbican_system_user_name }}"
     system_group: "{{ barbican_system_group_name }}"