Merge branch 'master' of /git/ansible

inventory/group_vars/qa-stg

@@ -69,6 +69,10 @@ buildslave_password: '{{ qa_stg_buildslave_password }}'
 deployment_type: qa-stg
 tcp_ports: [ 80, 222, 443, "{{ buildslave_port }}", 3306 ]
 
+# for downloading taskotron images
+imagesdir: /var/lib/diskimages
+slaves_group: apache
+
 # static sites
 static_sites:
   - name: "{{ inventory_hostname }}"
@@ -79,6 +83,11 @@ static_sites:
     document_root: /srv/content/docs
     external_name: "docs.{{ external_hostname }}"
 
+  - name: "images.{{ inventory_hostname }}"
+    document_root: /srv/content/images
+    external_name: "images.{{ external_hostname }}"
+
+
 sslonly: false
 
 freezes: false

playbooks/groups/qa.yml

@@ -108,6 +108,9 @@
       tags:
         - qastaticsites
 
+  roles:
+   - { role: taskotron/imagefactory-client, tags: ['imagefactoryclient']}
+
   handlers:
      - include: "{{ handlers }}/restart_services.yml"