From 3b113c0273cd78ada194c36b6a6854c9990ef797 Mon Sep 17 00:00:00 2001 From: Martin Krizek Date: Wed, 14 Dec 2016 20:39:01 +0000 Subject: [PATCH] taskotron staging: prepare for rebuild to F24 --- inventory/group_vars/taskotron-stg-client-hosts | 2 +- inventory/host_vars/resultsdb-stg01.qa.fedoraproject.org | 4 ++-- inventory/host_vars/taskotron-stg01.qa.fedoraproject.org | 6 +++--- roles/taskotron/buildmaster/tasks/main.yml | 4 ++-- roles/taskotron/buildslave/tasks/main.yml | 2 +- roles/taskotron/resultsdb-frontend/templates/settings.py.j2 | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/inventory/group_vars/taskotron-stg-client-hosts b/inventory/group_vars/taskotron-stg-client-hosts index 83a68d2c1f..c47a047e6f 100644 --- a/inventory/group_vars/taskotron-stg-client-hosts +++ b/inventory/group_vars/taskotron-stg-client-hosts @@ -38,7 +38,7 @@ taskotron_fas_user: taskotron taskotron_fas_password: '' 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 bodhi_server: http://bodhi.fedoraproject.org/ kojihub_url: http://koji.fedoraproject.org/kojihub diff --git a/inventory/host_vars/resultsdb-stg01.qa.fedoraproject.org b/inventory/host_vars/resultsdb-stg01.qa.fedoraproject.org index 16d55320e3..1ed4db6c20 100644 --- a/inventory/host_vars/resultsdb-stg01.qa.fedoraproject.org +++ b/inventory/host_vars/resultsdb-stg01.qa.fedoraproject.org @@ -17,8 +17,8 @@ eth0_nm: 255.255.255.128 # install ############################################################ -ks_url: http://10.5.126.23/repo/rhel/ks/kvm-fedora-23 -ks_repo: http://10.5.126.23/pub/fedora/linux/releases/23/Server/x86_64/os/ +ks_url: http://10.5.126.23/repo/rhel/ks/kvm-fedora-24 +ks_repo: http://10.5.126.23/pub/fedora/linux/releases/24/Server/x86_64/os/ volgroup: /dev/vg_guests vmhost: virthost-comm04.qa.fedoraproject.org diff --git a/inventory/host_vars/taskotron-stg01.qa.fedoraproject.org b/inventory/host_vars/taskotron-stg01.qa.fedoraproject.org index fe78422f05..c8619f61ca 100644 --- a/inventory/host_vars/taskotron-stg01.qa.fedoraproject.org +++ b/inventory/host_vars/taskotron-stg01.qa.fedoraproject.org @@ -17,8 +17,8 @@ ansible_ifcfg_blacklist: true # install ############################################################ -ks_url: http://10.5.126.23/repo/rhel/ks/kvm-fedora-23-taskotron-master -ks_repo: http://10.5.126.23/pub/fedora/linux/releases/23/Server/x86_64/os/ +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/24/Server/x86_64/os/ volgroup: /dev/vg_guests vmhost: virthost-comm04.qa.fedoraproject.org datacenter: phx2 @@ -30,7 +30,7 @@ fas_client_groups: sysadmin-qa,sysadmin-main # virtual machine ############################################################ -lvm_size: 55000 +lvm_size: 95000 mem_size: 4096 num_cpus: 4 diff --git a/roles/taskotron/buildmaster/tasks/main.yml b/roles/taskotron/buildmaster/tasks/main.yml index 419ae49ab0..4efce9329d 100644 --- a/roles/taskotron/buildmaster/tasks/main.yml +++ b/roles/taskotron/buildmaster/tasks/main.yml @@ -43,11 +43,11 @@ - 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 - 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) 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 seboolean: name=httpd_can_network_connect state=true persistent=yes diff --git a/roles/taskotron/buildslave/tasks/main.yml b/roles/taskotron/buildslave/tasks/main.yml index 0167940721..43f67ed892 100644 --- a/roles/taskotron/buildslave/tasks/main.yml +++ b/roles/taskotron/buildslave/tasks/main.yml @@ -55,7 +55,7 @@ - name: set the selinux fcontext type for the buildslave dir to var_lib_t command: semanage fcontext -a -t var_lib_t "{{ item.dir }}(/.*)?" 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 user: name={{ item.user }} group={{ slaves_group }} groups=testcloud,taskotron home={{ item.home }} diff --git a/roles/taskotron/resultsdb-frontend/templates/settings.py.j2 b/roles/taskotron/resultsdb-frontend/templates/settings.py.j2 index 7efa2cd6ee..7fc571a42e 100644 --- a/roles/taskotron/resultsdb-frontend/templates/settings.py.j2 +++ b/roles/taskotron/resultsdb-frontend/templates/settings.py.j2 @@ -1,6 +1,6 @@ # while you can use this as a template, we recommend that you use the blockerbugs # 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' {% else %} RDB_URL = 'http://127.0.0.1/{{ resultsdb_endpoint }}/api/v1.0'