From 66fe261659f32b3a3c1936ada4d8ab2b1eba7e19 Mon Sep 17 00:00:00 2001 From: Tim Flink Date: Thu, 23 Feb 2017 15:41:36 +0000 Subject: [PATCH 1/2] adding imagefactory client to qa-stg --- inventory/group_vars/qa-stg | 8 ++++++++ playbooks/groups/qa.yml | 3 +++ 2 files changed, 11 insertions(+) diff --git a/inventory/group_vars/qa-stg b/inventory/group_vars/qa-stg index 8cc1ddeb7d..c630d93838 100644 --- a/inventory/group_vars/qa-stg +++ b/inventory/group_vars/qa-stg @@ -69,6 +69,9 @@ 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 + # static sites static_sites: - name: "{{ inventory_hostname }}" @@ -79,6 +82,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 diff --git a/playbooks/groups/qa.yml b/playbooks/groups/qa.yml index 345c2bab82..2cab02eb9b 100644 --- a/playbooks/groups/qa.yml +++ b/playbooks/groups/qa.yml @@ -108,6 +108,9 @@ tags: - qastaticsites + roles: + - { role: taskotron/imagefactory-client, tags: ['imagefactoryclient']} + handlers: - include: "{{ handlers }}/restart_services.yml" From c2158a2f65183aceecdb1b7e4a9e89a30c4531cc Mon Sep 17 00:00:00 2001 From: Tim Flink Date: Thu, 23 Feb 2017 15:46:44 +0000 Subject: [PATCH 2/2] forgot variable for imagefactoryclient --- inventory/group_vars/qa-stg | 1 + 1 file changed, 1 insertion(+) diff --git a/inventory/group_vars/qa-stg b/inventory/group_vars/qa-stg index c630d93838..61aeaa1100 100644 --- a/inventory/group_vars/qa-stg +++ b/inventory/group_vars/qa-stg @@ -71,6 +71,7 @@ tcp_ports: [ 80, 222, 443, "{{ buildslave_port }}", 3306 ] # for downloading taskotron images imagesdir: /var/lib/diskimages +slaves_group: apache # static sites static_sites: