Differential D818

infra-ansible: deploy imagefactory on prod
ClosedPublic
Actions

Authored by jskladan on Apr 18 2016, 12:34 PM.

Details

Reviewers
tflink
mkrizek
Maniphest Tasks
T718: Move the taskotron's imagefactory from dev to prod
Summary

Imagefactory is now deployed on prod-machine, as well as on the dev machine. Prod and stg take images from prod, dev keeps to itself.

For the prod(/stg) master branch of the tools repo is used, develop for dev.

Test Plan

None, as it goes with ansible..

Diff Detail

Lint
Lint Skipped
Unit
Unit Tests Skipped
jskladan retitled this revision from to infra-ansible: deploy imagefactory on prod.Apr 18 2016, 12:34 PM
jskladan updated this object.
jskladan edited the test plan for this revision. (Show Details)
jskladan added reviewers: tflink, mkrizek.
jskladan added a project: infrastructure.
jskladan added a task: T718: Move the taskotron's imagefactory from dev to prod.
mkrizek added a comment.Apr 18 2016, 12:54 PM

Looks good, one suggestion though.

roles/taskotron/imagefactory-client/tasks/main.yml
16

You can put the branch name into variable and avoid having separate tasks for dev and stg/prod, no? Unless you are expecting more differences.

tflink accepted this revision.Apr 18 2016, 2:47 PM

I'll echo @mkrizek's suggestion to make the branch a variable unless you're expecting it to always be develop but otherwise, looks good to me

This revision is now accepted and ready to land.Apr 18 2016, 2:47 PM
tflink added a comment.Apr 18 2016, 2:49 PM

I'll rephrase a little bit.

Unless there are other differences you expect between dev and stg/prod, please use a variable instead of conditionals in the tasks file

mkrizek added a comment.May 18 2016, 10:56 AM

Just realized that one more thing is needed, in playbooks/groups/taskotron-client-hosts.yml there is a line:

- { role: taskotron/imagefactory-client, tags: ['imagefactoryclient'], when: deployment_type == 'dev' }

The condition needs to be removed.

jskladan updated this revision to Diff 2191.May 18 2016, 11:25 AM

Fixes according to comments in review

jskladan added a comment.May 18 2016, 11:39 AM

note that change to taskotron.yaml will be needed in order to actually enable using the images built by imagefactory on prod/stg, but I'd rather do this in a second step, after we successfully build the ones currently needed

mkrizek added a comment.May 18 2016, 12:03 PM
In D818#16174, @jskladan wrote:

note that change to taskotron.yaml will be needed in order to actually enable using the images built by imagefactory on prod/stg, but I'd rather do this in a second step, after we successfully build the ones currently needed

Yeah, I'll be changing taskotron.yaml when updating to the latest libtaskotron on stg and prod anyway.

ACK

jskladan closed this revision.May 18 2016, 1:23 PM

Revision Contents

Diff 2192

View Options

inventory/group_vars/taskotron-dev-client-hosts

Context not available.
74 74​
75imagefactory_host: qa11.qa.fedoraproject.org 75​imagefactory_host: qa11.qa.fedoraproject.org
76imagefactory_baseurl: 'http://{{imagefactory_host}}:8075/imagefactory' 76​imagefactory_baseurl: 'http://{{imagefactory_host}}:8075/imagefactory'
77​imagefactory_tools_branch: develop
77 78​
Context not available.
View Options

inventory/group_vars/taskotron-prod-client-hosts

Context not available.
67# imagefactory config 67​# imagefactory config
68############################################################ 68​############################################################
69 69​
70imagefactory_host: qa11.qa.fedoraproject.org 70​imagefactory_host: qa12.qa.fedoraproject.org
71imagefactory_baseurl: 'http://{{imagefactory_host}}:8075/imagefactory' 71​imagefactory_baseurl: 'http://{{imagefactory_host}}:8075/imagefactory'
72 72​imagefactory_tools_branch: master
Context not available.
View Options

inventory/group_vars/taskotron-stg-client-hosts

Context not available.
71# imagefactory config 71​# imagefactory config
72############################################################ 72​############################################################
73 73​
74imagefactory_host: qa11.qa.fedoraproject.org 74​imagefactory_host: qa12.qa.fedoraproject.org
75imagefactory_baseurl: 'http://{{imagefactory_host}}:8075/imagefactory' 75​imagefactory_baseurl: 'http://{{imagefactory_host}}:8075/imagefactory'
76 76​imagefactory_tools_branch: master
Context not available.
View Options

playbooks/groups/taskotron-client-hosts.yml

Context not available.
34 - include: "{{ handlers }}/restart_services.yml" 34​ - include: "{{ handlers }}/restart_services.yml"
35 35​
36- name: configure taskotron imagefactory 36​- name: configure taskotron imagefactory
37 hosts: qa11.qa.fedoraproject.org 37​ hosts: qa11.qa.fedoraproject.org:qa12.qa.fedoraproject.org
38 user: root 38​ user: root
39 gather_facts: True 39​ gather_facts: True
40 40​
Context not available.
61 61​
62 roles: 62​ roles:
63 - { role: taskotron/taskotron-client, tags: ['taskotronclient'] } 63​ - { role: taskotron/taskotron-client, tags: ['taskotronclient'] }
64 - { role: taskotron/imagefactory-client, tags: ['imagefactoryclient'], when: deployment_type == 'dev' } 64​ - { role: taskotron/imagefactory-client, tags: ['imagefactoryclient']}
65 - { role: taskotron/buildslave, tags: ['buildslave'] } 65​ - { role: taskotron/buildslave, tags: ['buildslave'] }
66 - { role: taskotron/buildslave-configure, tags: ['buildslaveconfigure'] } 66​ - { role: taskotron/buildslave-configure, tags: ['buildslaveconfigure'] }
67 67​
Context not available.
View Options

roles/taskotron/imagefactory-client/tasks/main.yml

Context not available.
13 repo: https://bitbucket.org/fedoraqa/base_images 13​ repo: https://bitbucket.org/fedoraqa/base_images
14 dest: '/var/lib/fedoraqa/base_images' 14​ dest: '/var/lib/fedoraqa/base_images'
15 update: yes 15​ update: yes
16​ version: '{{imagefactory_tools_branch}}'
mkrizekUnsubmitted
Not Done

You can put the branch name into variable and avoid having separate tasks for dev and stg/prod, no? Unless you are expecting more differences.

16 17​
17- name: Generate configuration 18​- name: Generate configuration
18 template: src=config.ini.j2 dest=/etc/taskotron_base_images/config.ini owner=root group=root mode=0644 19​ template: src=config.ini.j2 dest=/etc/taskotron_base_images/config.ini owner=root group=root mode=0644
Context not available.
View Options

roles/taskotron/imagefactory/tasks/main.yml

Context not available.
26 repo: https://bitbucket.org/fedoraqa/base_images 26​ repo: https://bitbucket.org/fedoraqa/base_images
27 dest: '/var/lib/fedoraqa/base_images' 27​ dest: '/var/lib/fedoraqa/base_images'
28 update: yes 28​ update: yes
29​ version: '{{imagefactory_tools_branch}}'
29 30​
30- name: Generate configuration 31​- name: Generate configuration
31 template: src=config_server.ini.j2 dest=/etc/taskotron_base_images/config_server.ini owner=root group=root mode=0644 32​ template: src=config_server.ini.j2 dest=/etc/taskotron_base_images/config_server.ini owner=root group=root mode=0644
Context not available.
34 cron: 35​ cron:
35 name: "Build new f23 taskotron_cloud images in ImageFactory" 36​ name: "Build new f23 taskotron_cloud images in ImageFactory"
36 special_time: daily 37​ special_time: daily
37 job: '/var/lib/fedoraqa/base_images/trigger_build/trigger_build.py build --config /etc/taskotron_base_images/config_server.ini --release 23 --arch x86_64 --flavor="taskotron_cloud" --disksize="20G" > /dev/null' 38​ job: '/var/lib/fedoraqa/base_images/trigger_build/trigger_build.py build --config /etc/taskotron_base_images/config_server.ini --release 23 --arch x86_64 --flavor="taskotron_cloud" --disksize="30G" > /dev/null'
38 39​
39- name: Create cronjob to build new F24 images 40​- name: Create cronjob to build new F24 images
40 cron: 41​ cron:
41 name: "Build new f24 taskotron_cloud images in ImageFactory" 42​ name: "Build new f24 taskotron_cloud images in ImageFactory"
42 special_time: daily 43​ special_time: daily
43 job: '/var/lib/fedoraqa/base_images/trigger_build/trigger_build.py build --config /etc/taskotron_base_images/config_server.ini --release 24 --arch x86_64 --flavor="taskotron_cloud" --disksize="20G" > /dev/null' 44​ job: '/var/lib/fedoraqa/base_images/trigger_build/trigger_build.py build --config /etc/taskotron_base_images/config_server.ini --release 24 --arch x86_64 --flavor="taskotron_cloud" --disksize="30G" > /dev/null'
44 45​
45- name: Create cronjob to build new rawhide images 46​- name: Create cronjob to build new rawhide images
46 cron: 47​ cron:
47 name: "Build new rawhide taskotron_cloud images in ImageFactory" 48​ name: "Build new rawhide taskotron_cloud images in ImageFactory"
48 special_time: daily 49​ special_time: daily
49 job: '/var/lib/fedoraqa/base_images/trigger_build/trigger_build.py build --config /etc/taskotron_base_images/config_server.ini --release rawhide --arch x86_64 --flavor="taskotron_cloud" --disksize="20G" > /dev/null' 50​ job: '/var/lib/fedoraqa/base_images/trigger_build/trigger_build.py build --config /etc/taskotron_base_images/config_server.ini --release rawhide --arch x86_64 --flavor="taskotron_cloud" --disksize="30G" > /dev/null'
50 51​
51- name: Create cronjob to report failed builds 52​- name: Create cronjob to report failed builds
52 cron: 53​ cron:
Context not available.