Infrastructure/ansible
1
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity Actions

taskotron staging: prepare for rebuild to F24

Browse source
This commit is contained in:
Martin Krizek 2016-12-14 20:39:01 +00:00
parent ea4ed40076
commit 3b113c0273
6 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
inventory/group_vars/taskotron-stg-client-hosts
View file

@ -38,7 +38,7 @@ taskotron_fas_user: taskotron
taskotron_fas_password: '' taskotron_fas_password: ''
execdb_external_url: https://taskotron.stg.fedoraproject.org/execdb/ execdb_external_url: https://taskotron.stg.fedoraproject.org/execdb/
resultsdb_server: http://resultsdb-stg01.qa.fedoraproject.org/resultsdb_api/api/v1.0/ resultsdb_server: http://resultsdb-stg01.qa.fedoraproject.org/resultsdb_api/api/v2.0/
# this should be proxy01.stg through /etc/hosts # this should be proxy01.stg through /etc/hosts
bodhi_server: http://bodhi.fedoraproject.org/ bodhi_server: http://bodhi.fedoraproject.org/
kojihub_url: http://koji.fedoraproject.org/kojihub kojihub_url: http://koji.fedoraproject.org/kojihub

4
inventory/host_vars/resultsdb-stg01.qa.fedoraproject.org
View file

@ -17,8 +17,8 @@ eth0_nm: 255.255.255.128
# install # install
############################################################ ############################################################
ks_url: http://10.5.126.23/repo/rhel/ks/kvm-fedora-23 ks_url: http://10.5.126.23/repo/rhel/ks/kvm-fedora-24
ks_repo: http://10.5.126.23/pub/fedora/linux/releases/23/Server/x86_64/os/ ks_repo: http://10.5.126.23/pub/fedora/linux/releases/24/Server/x86_64/os/
volgroup: /dev/vg_guests volgroup: /dev/vg_guests
vmhost: virthost-comm04.qa.fedoraproject.org vmhost: virthost-comm04.qa.fedoraproject.org

6
inventory/host_vars/taskotron-stg01.qa.fedoraproject.org
View file

@ -17,8 +17,8 @@ ansible_ifcfg_blacklist: true
# install # install
############################################################ ############################################################
ks_url: http://10.5.126.23/repo/rhel/ks/kvm-fedora-23-taskotron-master ks_url: http://10.5.126.23/repo/rhel/ks/kvm-fedora-24-taskotron-master
ks_repo: http://10.5.126.23/pub/fedora/linux/releases/23/Server/x86_64/os/ ks_repo: http://10.5.126.23/pub/fedora/linux/releases/24/Server/x86_64/os/
volgroup: /dev/vg_guests volgroup: /dev/vg_guests
vmhost: virthost-comm04.qa.fedoraproject.org vmhost: virthost-comm04.qa.fedoraproject.org
datacenter: phx2 datacenter: phx2
@ -30,7 +30,7 @@ fas_client_groups: sysadmin-qa,sysadmin-main
# virtual machine # virtual machine
############################################################ ############################################################
lvm_size: 55000 lvm_size: 95000
mem_size: 4096 mem_size: 4096
num_cpus: 4 num_cpus: 4

4
roles/taskotron/buildmaster/tasks/main.yml
View file

@ -43,11 +43,11 @@
- name: ensure buildmaster user can use home directory (old) - name: ensure buildmaster user can use home directory (old)
file: path="{{ buildmaster_home }}" state=directory owner=buildmaster group=buildmaster mode=0775 setype=user_home_t file: path="{{ buildmaster_home }}" state=directory owner=buildmaster group=buildmaster mode=0775 setype=user_home_t
when: deployment_type == 'prod' or deployment_type == 'stg' or deployment_type == 'local' when: deployment_type == 'prod' or deployment_type == 'local'
- name: ensure buildmaster user can use home directory (new) - name: ensure buildmaster user can use home directory (new)
file: path="{{ buildmaster_home }}" state=directory owner=buildmaster group=buildmaster mode=0775 file: path="{{ buildmaster_home }}" state=directory owner=buildmaster group=buildmaster mode=0775
when: deployment_type in ['dev'] when: deployment_type in ['dev', 'stg']
- name: allow httpd tcp connections with selinux - name: allow httpd tcp connections with selinux
seboolean: name=httpd_can_network_connect state=true persistent=yes seboolean: name=httpd_can_network_connect state=true persistent=yes

2
roles/taskotron/buildslave/tasks/main.yml
View file

@ -55,7 +55,7 @@
- name: set the selinux fcontext type for the buildslave dir to var_lib_t - name: set the selinux fcontext type for the buildslave dir to var_lib_t
command: semanage fcontext -a -t var_lib_t "{{ item.dir }}(/.*)?" command: semanage fcontext -a -t var_lib_t "{{ item.dir }}(/.*)?"
with_items: "{{ slaves }}" with_items: "{{ slaves }}"
when: slaves is defined and deployment_type == 'dev' when: slaves is defined and deployment_type in ['dev', 'stg']
- name: add buildslave users - name: add buildslave users
user: name={{ item.user }} group={{ slaves_group }} groups=testcloud,taskotron home={{ item.home }} user: name={{ item.user }} group={{ slaves_group }} groups=testcloud,taskotron home={{ item.home }}

2
roles/taskotron/resultsdb-frontend/templates/settings.py.j2
View file

@ -1,6 +1,6 @@
# while you can use this as a template, we recommend that you use the blockerbugs # while you can use this as a template, we recommend that you use the blockerbugs
# cli to generate a config file # cli to generate a config file
{% if deployment_type in ['dev'] %} {% if deployment_type in ['dev', 'stg'] %}
RDB_URL = 'http://127.0.0.1/{{ resultsdb_endpoint }}/api/v2.0' RDB_URL = 'http://127.0.0.1/{{ resultsdb_endpoint }}/api/v2.0'
{% else %} {% else %}
RDB_URL = 'http://127.0.0.1/{{ resultsdb_endpoint }}/api/v1.0' RDB_URL = 'http://127.0.0.1/{{ resultsdb_endpoint }}/api/v1.0'