From e25972f733eb639871bffe3c90bdf2a5f196fb44 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Mon, 16 Nov 2015 19:22:14 +0000 Subject: [PATCH] Switch twisted rhel6 buildbots to fedora23 --- ...acloud.org => twisted-fedora23-1.fedorainfracloud.org} | 8 ++++---- ...acloud.org => twisted-fedora23-2.fedorainfracloud.org} | 8 ++++---- inventory/inventory | 4 ++-- vars/global.yml | 1 + 4 files changed, 11 insertions(+), 10 deletions(-) rename inventory/host_vars/{twisted-rhel6-1.fedorainfracloud.org => twisted-fedora23-1.fedorainfracloud.org} (67%) rename inventory/host_vars/{twisted-rhel6-2.fedorainfracloud.org => twisted-fedora23-2.fedorainfracloud.org} (67%) diff --git a/inventory/host_vars/twisted-rhel6-1.fedorainfracloud.org b/inventory/host_vars/twisted-fedora23-1.fedorainfracloud.org similarity index 67% rename from inventory/host_vars/twisted-rhel6-1.fedorainfracloud.org rename to inventory/host_vars/twisted-fedora23-1.fedorainfracloud.org index 889ab67445..c64db3c1ae 100644 --- a/inventory/host_vars/twisted-rhel6-1.fedorainfracloud.org +++ b/inventory/host_vars/twisted-fedora23-1.fedorainfracloud.org @@ -1,5 +1,5 @@ --- -image: "{{ centos66_x86_64 }}" +image: "{{ fedora23_x86_64: }}" instance_type: m1.medium keypair: fedora-admin-20130801 security_group: ssh-anywhere-pythonbots,all-icmp-pythonbots,default @@ -7,10 +7,10 @@ zone: nova tcp_ports: [22, 80, 443] inventory_tenant: pythonbots -inventory_instance_name: twisted-rhel6-1 -hostbase: twisted-rhel6-1 +inventory_instance_name: twisted-fedora23-1 +hostbase: twisted-fedora23-1 public_ip: 209.132.184.185 -description: twisted buildbot for rhel 6 +description: twisted buildbot for fedora 23 cloud_networks: # pythonbots-net diff --git a/inventory/host_vars/twisted-rhel6-2.fedorainfracloud.org b/inventory/host_vars/twisted-fedora23-2.fedorainfracloud.org similarity index 67% rename from inventory/host_vars/twisted-rhel6-2.fedorainfracloud.org rename to inventory/host_vars/twisted-fedora23-2.fedorainfracloud.org index 9626f598e9..b01377d6b2 100644 --- a/inventory/host_vars/twisted-rhel6-2.fedorainfracloud.org +++ b/inventory/host_vars/twisted-fedora23-2.fedorainfracloud.org @@ -1,5 +1,5 @@ --- -image: "{{ centos66_x86_64 }}" +image: "{{ fedora23_x86_64 }}" instance_type: m1.medium keypair: fedora-admin-20130801 security_group: ssh-anywhere-pythonbots,all-icmp-pythonbots,default @@ -7,10 +7,10 @@ zone: nova tcp_ports: [22, 80, 443] inventory_tenant: pythonbots -inventory_instance_name: twisted-rhel6-2 -hostbase: twisted-rhel6-2 +inventory_instance_name: twisted-fedora23-2 +hostbase: twisted-fedora23-2 public_ip: 209.132.184.186 -description: twisted buildbot for rhel6 2 +description: twisted buildbot for fedora23 2 cloud_networks: # pythonbots-net diff --git a/inventory/inventory b/inventory/inventory index 7789609290..76fdde8b45 100644 --- a/inventory/inventory +++ b/inventory/inventory @@ -1077,8 +1077,8 @@ twisted-fedora21-1.fedorainfracloud.org twisted-fedora21-2.fedorainfracloud.org twisted-fedora22-1.fedorainfracloud.org twisted-fedora22-2.fedorainfracloud.org -twisted-rhel6-1.fedorainfracloud.org -twisted-rhel6-2.fedorainfracloud.org +twisted-fedora23-1.fedorainfracloud.org +twisted-fedora23-2.fedorainfracloud.org twisted-rhel7-1.fedorainfracloud.org twisted-rhel7-2.fedorainfracloud.org diff --git a/vars/global.yml b/vars/global.yml index 4228b6c5f0..0ae1722167 100644 --- a/vars/global.yml +++ b/vars/global.yml @@ -38,6 +38,7 @@ fedora22_x86_64: Fedora-Cloud-Base-22-20150521.x86_64 fedora_atomic_22_alpha: Fedora-Cloud-Atomic-22_Alpha-20150305.x86_64 fedora_atomic_22_beta: Fedora-Cloud-Atomic-22_Beta-20150415.x86_64 fedora_atomic_22: Fedora-Cloud-Atomic-22-20150521.x86_64 +fedora23_x86_64: Fedora-Cloud-Base-23-20151030.x86_64 centos70_x86_64: CentOS-7-x86_64-GenericCloud-1503 centos66_x86_64: CentOS-6-x86_64-GenericCloud-20141129_01 rhel70_x86_64: rhel-guest-image-7.0-20140930.0.x86_64