Merge pull request #599 from holta/master

OS messaging consistent w/ other playbooks

roles/osm/tasks/main.yml

@@ -71,13 +71,13 @@
      osm_path: "{{ osm_venv }}/lib/python2.7/site-packages/iiab"
   when: osm_enabled and is_debuntu
 
-- name: All - Point wsgi to virtual environment
+- name: Point wsgi to virtual environment (all OS's)
   lineinfile: dest={{ osm_venv }}/bin/iiab.wsgi
               regexp="path_to_virtualenv = None"
               line="path_to_virtualenv = '/usr/local/osm'"
               state=present
 
-- name: All - Copy OSM config file
+- name: Copy OSM config file (all OS's)
   template: backup=no
             src=osm.conf.j2
             dest=/etc/{{ apache_config_dir }}/osm.conf
@@ -86,28 +86,28 @@
             mode=0644
   when: osm_enabled
 
-- name: Debuntu - Create a link from sites-enabled to sites-available
+- name: Create a link from sites-enabled to sites-available (debuntu)
   file: src=/etc/{{ apache_config_dir }}/osm.conf
         dest=/etc/apache2/sites-enabled/osm.conf
         state=link
   when: osm_enabled and is_debuntu
 
-- name: Debuntu - Remove the link from sites-enabled to sites-available
+- name: Remove the link from sites-enabled to sites-available (debuntu)
   file: dest=/etc/apache2/sites-enabled/osm.conf
         state=absent
   when: not osm_enabled and is_debuntu
 
-- name: Redhat - Remove the osm.conf
+- name: Remove the osm.conf (redhat)
   file: dest=/{{ apache_config_dir }}/osm.conf
         state=absent
   when: not osm_enabled and is_redhat
 
-- name: All - Remove link to cgi
+- name: Remove link to cgi (all OS's)
   file: dest={{ doc_root }}/osm.wsgi
         state=absent
   when: not osm_enabled
 
-- name: All - Create link to cgi
+- name: Create link to cgi (all OS's)
   file: src={{ osm_venv }}/bin/iiab.wsgi
         dest={{ doc_root }}/osm.wsgi
         owner=root