From fd6b3f475ed48ecbc7f05dde0590f5f44dfe2b52 Mon Sep 17 00:00:00 2001 From: Valentin Gologuzov Date: Tue, 19 May 2015 16:33:25 +0200 Subject: [PATCH] [copr] updates common /etc/hosts [copr][backend] use builder base image, use new build playbooks --- inventory/group_vars/copr-back | 3 ++- roles/copr/backend/templates/copr-be.conf.j2 | 13 ++++--------- roles/copr/base/files/hosts | 4 ++-- 3 files changed, 8 insertions(+), 12 deletions(-) diff --git a/inventory/group_vars/copr-back b/inventory/group_vars/copr-back index 4c8e4eb41c..33e3e69a06 100644 --- a/inventory/group_vars/copr-back +++ b/inventory/group_vars/copr-back @@ -6,7 +6,8 @@ copr_nova_tenant_id: "undefined_tenant_id" copr_nova_tenant_name: "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_network_name: "copr-net" copr_builder_key_name: "buildsys" diff --git a/roles/copr/backend/templates/copr-be.conf.j2 b/roles/copr/backend/templates/copr-be.conf.j2 index 01797ec024..676afd9dee 100644 --- a/roles/copr/backend/templates/copr-be.conf.j2 +++ b/roles/copr/backend/templates/copr-be.conf.j2 @@ -16,7 +16,6 @@ group0_name=PC group0_archs=i386,x86_64 -{% if devel %} # new OS cloud, VMM based backend group0_spawn_playbook=/home/copr/provision/builderpb_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_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 terminate_vars=vm_name diff --git a/roles/copr/base/files/hosts b/roles/copr/base/files/hosts index c5dbc18f17..ee6f7d3670 100644 --- a/roles/copr/base/files/hosts +++ b/roles/copr/base/files/hosts @@ -1,7 +1,7 @@ 127.0.0.1 localhost localhost.localdomain localhost4 localhost4.localdomain4 ::1 localhost localhost.localdomain localhost6 localhost6.localdomain6 -172.16.5.31 copr-fe.cloud.fedoraproject.org -172.16.5.31 copr.fedoraproject.org +172.25.32.17 copr-fe.cloud.fedoraproject.org +172.25.32.17 copr.fedoraproject.org 172.25.32.21 copr-be.cloud.fedoraproject.org #172.16.5.5 copr-be-dev.cloud.fedoraproject.org #172.16.5.15 copr-fe-dev.cloud.fedoraproject.org