Merge pull request #478 from edx/cg/rename_libraries

Renaming local modules to not overwrite the ansible's library names

playbooks/edx_provision_test.yml

@@ -45,6 +45,6 @@
   tasks:
     - name: Terminate instances that were previously launched
       local_action: 
-        module: ec2 
+        module: ec2_local
         state: 'absent'
         instance_ids: ${ec2.instance_ids}

playbooks/roles/analytics-server/defaults/main.yml

@@ -87,4 +87,4 @@ as_redhat_pkgs:
 # Installed via pip to get the IAM role feature.
 #
 as_pip_pkgs:
-  - git+https://github.com/s3tools/s3cmd.git#egg=s3cmd
+  - git+https://github.com/s3tools/s3cmd.git#egg=s3cmd
\ No newline at end of file

playbooks/roles/analytics-server/meta/main.yml

@@ -8,4 +8,4 @@ dependencies:
   automated_sudoers_template: 'roles/analytics-server/templates/etc/sudoers.d/99-automator-analytics-server.j2'
   }
 
-  
+  
\ No newline at end of file

playbooks/roles/analytics-server/tasks/main.yml

@@ -133,4 +133,4 @@
     src=etc/init/analytics.conf.j2 dest=/etc/init/analytics.conf
     owner=root group=root
 
-- include: deploy.yml    
+- include: deploy.yml    
\ No newline at end of file

playbooks/roles/analytics/defaults/main.yml

@@ -87,4 +87,4 @@ analytics_redhat_pkgs:
 # Installed via pip to get the IAM role feature.
 #
 analytics_pip_pkgs:
-  - git+https://github.com/s3tools/s3cmd.git#egg=s3cmd
+  - git+https://github.com/s3tools/s3cmd.git#egg=s3cmd
\ No newline at end of file

playbooks/roles/analytics/tasks/main.yml

@@ -133,4 +133,4 @@
     src=etc/init/analytics.conf.j2 dest=/etc/init/analytics.conf
     owner=root group=root
 
-- include: deploy.yml    
+- include: deploy.yml    
\ No newline at end of file

playbooks/roles/apache/defaults/main.yml

 ---
-apache_port: 80
+apache_port: 80
\ No newline at end of file

playbooks/roles/certs/handlers/main.yml

@@ -15,7 +15,7 @@
 #
 
 - name: certs | restart certs
-  supervisorctl: >
+  supervisorctl_local: >
     name=certs
     supervisorctl_path={{ supervisor_ctl }}
     config={{ supervisor_cfg }}

playbooks/roles/certs/tasks/deploy.yml

@@ -68,7 +68,7 @@
   changed_when: supervisor_update.stdout != ""
 
 - name: certs | ensure certs has started
-  supervisorctl: >
+  supervisorctl_local: >
     name=certs
     supervisorctl_path={{ supervisor_ctl }}
     config={{ supervisor_cfg }}

playbooks/roles/devpi/handlers/main.yml

@@ -12,7 +12,7 @@
 #
 ---
 - name: devpi | restart devpi
-  supervisorctl: >
+  supervisorctl_local: >
     state=restarted
     supervisorctl_path={{ devpi_supervisor_ctl }}
     config={{ devpi_supervisor_cfg }}

playbooks/roles/devpi/tasks/main.yml

@@ -107,7 +107,7 @@
   tags: deploy
 
 - name: devpi | ensure devpi is started
-  supervisorctl: >
+  supervisorctl_local: >
     state=started
     supervisorctl_path={{ devpi_supervisor_ctl }}
     config={{ devpi_supervisor_cfg }}

playbooks/roles/discern/handlers/main.yml

 ---
 - name: discern | restart discern
-  supervisorctl: >
+  supervisorctl_local: >
     name=discern
     supervisorctl_path={{ supervisor_ctl }}
     config={{ supervisor_cfg }}

playbooks/roles/discern/tasks/deploy.yml

@@ -121,7 +121,7 @@
   tags: deploy
 
 - name: discern | ensure discern, discern_celery has started
-  supervisorctl: >
+  supervisorctl_local: >
     name={{ item }}
     supervisorctl_path={{ supervisor_ctl }}
     config={{ supervisor_cfg }}

playbooks/roles/edxapp/handlers/main.yml

 ---
 - name: edxapp | restart edxapp
-  supervisorctl: >
+  supervisorctl_local: >
     state=restarted
     supervisorctl_path={{ supervisor_ctl }}
     config={{ supervisor_cfg }}
@@ -11,7 +11,7 @@
   tags: deploy
 
 - name: edxapp | restart edxapp_workers
-  supervisorctl: >
+  supervisorctl_local: >
     name="edxapp_worker:{{ item.service_variant }}_{{ item.queue }}_{{ item.concurrency }}"
     supervisorctl_path={{ supervisor_ctl }}
     config={{ supervisor_cfg }}

playbooks/roles/edxapp/tasks/deploy.yml

@@ -231,7 +231,7 @@
   tags: deploy
 
 - name: edxapp | ensure edxapp has started
-  supervisorctl: >
+  supervisorctl_local: >
     state=started
     supervisorctl_path={{ supervisor_ctl }}
     config={{ supervisor_cfg }}
@@ -242,7 +242,7 @@
   tags: deploy
 
 - name: edxapp | ensure edxapp_workers has started
-  supervisorctl: >
+  supervisorctl_local: >
     name="edxapp_worker:{{ item.service_variant }}_{{ item.queue }}_{{ item.concurrency }}"
     supervisorctl_path={{ supervisor_ctl }}
     config={{ supervisor_cfg }}

playbooks/roles/elasticsearch/defaults/main.yml

@@ -3,4 +3,4 @@
 elasticsearch_version: "0.90.2"
 elasticsearch_sha: "397227ce37f616734f39f6e93539c9eaa82bec9"
 elasticsearch_file: "elasticsearch-{{ elasticsearch_version }}.deb"
-elasticsearch_url: "https://download.elasticsearch.org/elasticsearch/elasticsearch/{{ elasticsearch_file }}"
+elasticsearch_url: "https://download.elasticsearch.org/elasticsearch/elasticsearch/{{ elasticsearch_file }}"
\ No newline at end of file

playbooks/roles/forum/handlers/main.yml

 ---
 - name: forum | restart the forum service
-  supervisorctl: >
+  supervisorctl_local: >
     name=forum
     supervisorctl_path={{ supervisor_ctl }}
     config={{ supervisor_cfg }}

playbooks/roles/forum/tasks/deploy.yml

@@ -49,7 +49,7 @@
   tags: deploy
 
 - name: forum | ensure forum is started
-  supervisorctl: >
+  supervisorctl_local: >
     name=forum
     supervisorctl_path={{ supervisor_ctl }}
     config={{ supervisor_cfg }}

playbooks/roles/launch_ec2/tasks/main.yml

@@ -18,7 +18,7 @@
 
 - name: terminating single instance
   local_action:
-    module: ec2
+    module: ec2_local
     state: 'absent'
     region: "{{ region }}"
     instance_ids: ${tag_lookup.instance_ids}
@@ -36,7 +36,7 @@
 
 - name: launch_ec2 | Launch ec2 instance
   local_action:
-    module: ec2
+    module: ec2_local
     keypair: "{{ keypair }}"
     group: "{{ security_group }}"
     instance_type: "{{ instance_type }}"

playbooks/roles/notifier/handlers/main.yml

 ---
 
 - name: notifier | restart notifier-scheduler
-  supervisorctl: >
+  supervisorctl_local: >
     name=notifier-scheduler
     state=restarted
     config={{ supervisor_cfg }}
@@ -9,7 +9,7 @@
   tags: deploy
 
 - name: notifier | restart notifier-celery-workers
-  supervisorctl: >
+  supervisorctl_local: >
     name=notifier-celery-workers
     state=restarted
     config={{ supervisor_cfg }}

playbooks/roles/notifier/tasks/deploy.yml

@@ -39,4 +39,4 @@
     - notifier | restart notifier-scheduler
     - notifier | restart notifier-celery-workers
   tags:
-  - deploy
+  - deploy
\ No newline at end of file

playbooks/roles/notifier/tasks/main.yml

@@ -99,4 +99,4 @@
   sudo_user: "{{ supervisor_user }}"
   notify: notifier | restart notifier-scheduler
 
-- include: deploy.yml
+- include: deploy.yml
\ No newline at end of file

playbooks/roles/ora/handlers/main.yml

 ---
 - name: ora | restart ora
-  supervisorctl: >
+  supervisorctl_local: >
     name=ora
     supervisorctl_path={{ supervisor_ctl }}
     config={{ supervisor_cfg }}
@@ -8,7 +8,7 @@
   tags: deploy
 
 - name: ora | restart ora_celery
-  supervisorctl: >
+  supervisorctl_local: >
     name=ora_celery
     supervisorctl_path={{ supervisor_ctl }}
     config={{ supervisor_cfg }}

playbooks/roles/ora/tasks/deploy.yml

@@ -98,7 +98,7 @@
   tags: deploy
 
 - name: ora | ensure ora is started
-  supervisorctl: >
+  supervisorctl_local: >
     name=ora
     supervisorctl_path={{ supervisor_ctl }}
     config={{ supervisor_cfg }}
@@ -106,7 +106,7 @@
   tags: deploy
 
 - name: ora | ensure ora_celery is started
-  supervisorctl: >
+  supervisorctl_local: >
     name=ora_celery
     supervisorctl_path={{ supervisor_ctl }}
     config={{ supervisor_cfg }}

playbooks/roles/s3fs/defaults/main.yml

@@ -43,4 +43,4 @@ s3fs_redhat_pkgs:
   - curl-devel
   - libxml2-devel
   - openssl-devel
-  - mailcap
+  - mailcap
\ No newline at end of file

playbooks/roles/xqueue/handlers/main.yml

 - name: xqueue | restart xqueue
-  supervisorctl: >
+  supervisorctl_local: >
     name={{ item }}
     supervisorctl_path={{ supervisor_ctl }}
     config={{ supervisor_cfg }}

playbooks/roles/xqueue/tasks/deploy.yml

@@ -83,7 +83,7 @@
   tags: deploy
 
 - name: xqueue | ensure xqueue, consumer is running
-  supervisorctl: >
+  supervisorctl_local: >
     name={{ item }}
     supervisorctl_path={{ supervisor_ctl }}
     config={{ supervisor_cfg }}

playbooks/roles/xserver/handlers/main.yml

@@ -15,7 +15,7 @@
 #
 
 - name: xserver | restart xserver
-  supervisorctl: >
+  supervisorctl_local: >
     name=xserver
     supervisorctl_path={{ supervisor_ctl }}
     config={{ supervisor_cfg }}

playbooks/roles/xserver/tasks/deploy.yml

@@ -76,7 +76,7 @@
   tags: deploy
 
 - name: xserver | ensure xserver is started
-  supervisorctl: >
+  supervisorctl_local: >
     name=xserver
     supervisorctl_path={{ supervisor_ctl }}
     config={{ supervisor_cfg }}