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

[copr] updates common /etc/hosts

Browse source 
[copr][backend] use builder base image, use new build playbooks
This commit is contained in:
Valentin Gologuzov 2015-05-19 16:33:25 +02:00
parent 4b4a3fd570
commit fd6b3f475e
3 changed files with 8 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

3
inventory/group_vars/copr-back
View file

@ -6,7 +6,8 @@ copr_nova_tenant_id: "undefined_tenant_id"
copr_nova_tenant_name: "copr" copr_nova_tenant_name: "copr"
copr_nova_username: "copr" copr_nova_username: "copr"
copr_builder_image_name: "Fedora-Cloud-Base-20141203-21" # copr_builder_image_name: "Fedora-Cloud-Base-20141203-21"
copr_builder_image_name: "builder-2015-05-15"
copr_builder_flavor_name: "m1.builder" copr_builder_flavor_name: "m1.builder"
copr_builder_network_name: "copr-net" copr_builder_network_name: "copr-net"
copr_builder_key_name: "buildsys" copr_builder_key_name: "buildsys"

13
roles/copr/backend/templates/copr-be.conf.j2
View file

@ -16,7 +16,6 @@ group0_name=PC
group0_archs=i386,x86_64 group0_archs=i386,x86_64
{% if devel %}
# new OS cloud, VMM based backend # new OS cloud, VMM based backend
group0_spawn_playbook=/home/copr/provision/builderpb_nova.yml group0_spawn_playbook=/home/copr/provision/builderpb_nova.yml
group0_terminate_playbook=/home/copr/provision/terminatepb_nova.yml group0_terminate_playbook=/home/copr/provision/terminatepb_nova.yml
@ -25,15 +24,11 @@ group0_max_workers=20
group0_max_vm_per_user=4 group0_max_vm_per_user=4
group0_max_vm_total=12 group0_max_vm_total=12
## old OS cloud, non VMM backend
#group0_spawn_playbook=/home/copr/provision/builderpb.yml
#group0_terminate_playbook=/home/copr/provision/terminatepb.yml
#group0_max_workers=4
{% else %}
# old OS cloud, non VMM backend
group0_spawn_playbook=/home/copr/provision/builderpb.yml
group0_terminate_playbook=/home/copr/provision/terminatepb.yml
group0_max_workers=4
{% endif %}
# soon this will be obsoleted # soon this will be obsoleted
terminate_vars=vm_name terminate_vars=vm_name

4
roles/copr/base/files/hosts
View file

@ -1,7 +1,7 @@
127.0.0.1 localhost localhost.localdomain localhost4 localhost4.localdomain4 127.0.0.1 localhost localhost.localdomain localhost4 localhost4.localdomain4
::1 localhost localhost.localdomain localhost6 localhost6.localdomain6 ::1 localhost localhost.localdomain localhost6 localhost6.localdomain6
172.16.5.31 copr-fe.cloud.fedoraproject.org 172.25.32.17 copr-fe.cloud.fedoraproject.org
172.16.5.31 copr.fedoraproject.org 172.25.32.17 copr.fedoraproject.org
172.25.32.21 copr-be.cloud.fedoraproject.org 172.25.32.21 copr-be.cloud.fedoraproject.org
#172.16.5.5 copr-be-dev.cloud.fedoraproject.org #172.16.5.5 copr-be-dev.cloud.fedoraproject.org
#172.16.5.15 copr-fe-dev.cloud.fedoraproject.org #172.16.5.15 copr-fe-dev.cloud.fedoraproject.org