From e20ea5e6cc567a47cf55c49dad979089f908997c Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Tue, 10 Dec 2013 19:47:59 +0000 Subject: [PATCH] Update size on f19 jenkins. Make f20 builder. --- inventory/host_vars/209.132.184.158 | 4 ++-- inventory/host_vars/209.132.184.209 | 11 +++++++++++ inventory/inventory | 3 ++- vars/global.yml | 5 ++++- 4 files changed, 19 insertions(+), 4 deletions(-) create mode 100644 inventory/host_vars/209.132.184.209 diff --git a/inventory/host_vars/209.132.184.158 b/inventory/host_vars/209.132.184.158 index 90a32f8bb1..df09f812bb 100644 --- a/inventory/host_vars/209.132.184.158 +++ b/inventory/host_vars/209.132.184.158 @@ -1,7 +1,7 @@ --- -instance_type: m1.large +instance_type: m1.xlarge image: $f19_qcow_id -keypair: fedora-admin +keypair: fedora-admin-20130801 security_group: jenkins zone: nova hostbase: jenkins-f19 diff --git a/inventory/host_vars/209.132.184.209 b/inventory/host_vars/209.132.184.209 new file mode 100644 index 0000000000..df09f812bb --- /dev/null +++ b/inventory/host_vars/209.132.184.209 @@ -0,0 +1,11 @@ +--- +instance_type: m1.xlarge +image: $f19_qcow_id +keypair: fedora-admin-20130801 +security_group: jenkins +zone: nova +hostbase: jenkins-f19 +public_ip: 209.132.184.158 +root_auth_users: pingou +description: jenkins f19 worker/slave + diff --git a/inventory/inventory b/inventory/inventory index 4ab5cf3eaa..883f634464 100644 --- a/inventory/inventory +++ b/inventory/inventory @@ -425,7 +425,8 @@ jenkins-cloud 209.132.184.166 # F19 builder 209.132.184.158 - +# F20 builder +209.132.184.209 [jenkins-cloud] 209.132.184.153 diff --git a/vars/global.yml b/vars/global.yml index a6efa57059..519744d969 100644 --- a/vars/global.yml +++ b/vars/global.yml @@ -16,7 +16,10 @@ el6_qcow_id: ami-00000013 f18_qcow_id: ami-00000016 el6_ami_id: ami-0000000e f17_qcow_id: ami-00000001 -f19_qcow_id: ami-00000018 +# Fedora-19-RC2-x86_64 +f19_qcow_id: ami-00000020 +# Fedora-20-TC4-x86_64 +f20_qcow_id: ami-00000038 global_pkgs_inst: ['bind-utils', 'joe', 'mailx', 'nc', 'openssh-clients', 'patch', 'postfix', 'rsync', 'strace', 'telnet', 'tmpwatch', 'traceroute', 'vim-enhanced', 'xz', 'zsh',