From ab21a8dc9f6d2310bdfdb48f8420f3f84da3a924 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Tue, 7 Jan 2014 19:02:48 +0000 Subject: [PATCH] Clean up host_vars. Move everything to new ssh key, fix old syntax. --- inventory/host_vars/209.132.184.142 | 2 +- inventory/host_vars/209.132.184.143 | 4 ++-- inventory/host_vars/209.132.184.144 | 2 +- inventory/host_vars/209.132.184.146 | 2 +- inventory/host_vars/209.132.184.147 | 4 ++-- inventory/host_vars/209.132.184.153 | 4 ++-- inventory/host_vars/209.132.184.157 | 2 +- inventory/host_vars/209.132.184.158 | 3 +-- inventory/host_vars/209.132.184.162 | 6 +++--- inventory/host_vars/209.132.184.165 | 4 ++-- inventory/host_vars/209.132.184.166 | 5 ++--- inventory/host_vars/209.132.184.209 | 3 +-- inventory/host_vars/blockerbugs-dev.cloud.fedoraproject.org | 2 +- inventory/host_vars/buildvm-04.phx2.fedoraproject.org | 1 - inventory/host_vars/buildvm-05.phx2.fedoraproject.org | 1 - inventory/host_vars/buildvm-06.phx2.fedoraproject.org | 1 - inventory/host_vars/buildvm-07.phx2.fedoraproject.org | 3 --- inventory/host_vars/buildvm-08.phx2.fedoraproject.org | 3 --- inventory/host_vars/buildvm-09.phx2.fedoraproject.org | 3 --- inventory/host_vars/buildvm-10.phx2.fedoraproject.org | 3 --- inventory/host_vars/buildvm-11.phx2.fedoraproject.org | 3 --- inventory/host_vars/buildvm-12.phx2.fedoraproject.org | 3 --- inventory/host_vars/buildvm-13.phx2.fedoraproject.org | 3 --- inventory/host_vars/buildvm-14.phx2.fedoraproject.org | 3 --- inventory/host_vars/buildvm-15.phx2.fedoraproject.org | 3 --- inventory/host_vars/buildvm-16.phx2.fedoraproject.org | 2 -- inventory/host_vars/buildvm-17.phx2.fedoraproject.org | 2 -- inventory/host_vars/buildvm-18.phx2.fedoraproject.org | 3 --- inventory/host_vars/buildvm-19.phx2.fedoraproject.org | 3 --- inventory/host_vars/buildvm-20.phx2.fedoraproject.org | 3 --- inventory/host_vars/buildvm-21.phx2.fedoraproject.org | 3 --- inventory/host_vars/buildvm-22.phx2.fedoraproject.org | 3 --- inventory/host_vars/buildvm-23.phx2.fedoraproject.org | 3 --- inventory/host_vars/buildvm-24.phx2.fedoraproject.org | 3 --- inventory/host_vars/buildvm-25.phx2.fedoraproject.org | 2 -- inventory/host_vars/buildvm-26.phx2.fedoraproject.org | 3 --- inventory/host_vars/buildvm-27.phx2.fedoraproject.org | 3 --- inventory/host_vars/copr-be-dev.cloud.fedoraproject.org | 2 +- inventory/host_vars/copr-fe-dev.cloud.fedoraproject.org | 2 +- inventory/host_vars/hrf.cloud.fedoraproject.org | 4 ++-- inventory/host_vars/jenkins.cloud.fedoraproject.org | 4 ++-- inventory/host_vars/lists-dev.cloud.fedoraproject.org | 4 ++-- 42 files changed, 28 insertions(+), 94 deletions(-) diff --git a/inventory/host_vars/209.132.184.142 b/inventory/host_vars/209.132.184.142 index e6bd8a34c4..aa7f65cb5d 100644 --- a/inventory/host_vars/209.132.184.142 +++ b/inventory/host_vars/209.132.184.142 @@ -1,6 +1,6 @@ --- instance_type: m1.xlarge -image: ${f19_qcow_id} +image: {{ f19_qcow_id }} keypair: fedora-admin-20130801 security_group: webserver zone: nova diff --git a/inventory/host_vars/209.132.184.143 b/inventory/host_vars/209.132.184.143 index 67343dd6e9..a1b42d244e 100644 --- a/inventory/host_vars/209.132.184.143 +++ b/inventory/host_vars/209.132.184.143 @@ -1,7 +1,7 @@ --- instance_type: m1.small -image: $el6_qcow_id -keypair: fedora-admin +image: {{ el6_qcow_id }} +keypair: fedora-admin-20130801 security_group: webserver zone: nova hostbase: artboard- diff --git a/inventory/host_vars/209.132.184.144 b/inventory/host_vars/209.132.184.144 index b68eb5a552..122a14667d 100644 --- a/inventory/host_vars/209.132.184.144 +++ b/inventory/host_vars/209.132.184.144 @@ -1,6 +1,6 @@ --- instance_type: m1.medium -image: ${f19_qcow_id} +image: {{ f19_qcow_id }} keypair: fedora-admin-20130801 security_group: webserver zone: nova diff --git a/inventory/host_vars/209.132.184.146 b/inventory/host_vars/209.132.184.146 index 50066f9a48..72d3bbdb13 100644 --- a/inventory/host_vars/209.132.184.146 +++ b/inventory/host_vars/209.132.184.146 @@ -1,6 +1,6 @@ --- instance_type: m1.large -image: $f20_qcow_id +image: {{ f20_qcow_id }} keypair: fedora-admin-20130801 security_group: logstash zone: nova diff --git a/inventory/host_vars/209.132.184.147 b/inventory/host_vars/209.132.184.147 index c4b671a332..7fcce35a7f 100644 --- a/inventory/host_vars/209.132.184.147 +++ b/inventory/host_vars/209.132.184.147 @@ -1,7 +1,7 @@ --- instance_type: m1.small -image: $f18_qcow_id -keypair: fedora-admin +image: {{ el6_qcow_id }} +keypair: fedora-admin-20130801 security_group: webserver zone: nova hostbase: fedocal-dev- diff --git a/inventory/host_vars/209.132.184.153 b/inventory/host_vars/209.132.184.153 index 0f12d25289..2300f647dd 100644 --- a/inventory/host_vars/209.132.184.153 +++ b/inventory/host_vars/209.132.184.153 @@ -1,7 +1,7 @@ --- instance_type: m1.small -image: $el6_qcow_id -keypair: fedora-admin +image: {{ el6_qcow_id }} +keypair: fedora-admin-20130801 security_group: jenkins zone: nova hostbase: jenkins-master- diff --git a/inventory/host_vars/209.132.184.157 b/inventory/host_vars/209.132.184.157 index 93f97d3d4b..c60297a261 100644 --- a/inventory/host_vars/209.132.184.157 +++ b/inventory/host_vars/209.132.184.157 @@ -1,6 +1,6 @@ --- instance_type: m1.large -image: $f19_qcow_id +image: {{ f19_qcow_id }} keypair: fedora-admin-20130801 security_group: webserver zone: nova diff --git a/inventory/host_vars/209.132.184.158 b/inventory/host_vars/209.132.184.158 index df09f812bb..84b2dbfe00 100644 --- a/inventory/host_vars/209.132.184.158 +++ b/inventory/host_vars/209.132.184.158 @@ -1,6 +1,6 @@ --- instance_type: m1.xlarge -image: $f19_qcow_id +image: {{ f19_qcow_id }} keypair: fedora-admin-20130801 security_group: jenkins zone: nova @@ -8,4 +8,3 @@ hostbase: jenkins-f19 public_ip: 209.132.184.158 root_auth_users: pingou description: jenkins f19 worker/slave - diff --git a/inventory/host_vars/209.132.184.162 b/inventory/host_vars/209.132.184.162 index e5142127a0..8126175c6d 100644 --- a/inventory/host_vars/209.132.184.162 +++ b/inventory/host_vars/209.132.184.162 @@ -1,11 +1,11 @@ --- instance_type: m1.small -image: ${el6_qcow_id} -keypair: fedora-admin +image: {{ el6_qcow_id }} +keypair: fedora-admin-20130801 security_group: webserver zone: nova hostbase: elections-dev- public_ip: 209.132.184.162 root_auth_users: toshio fchiulli description: cloud instance for developing the next version of the elections app -volumes: ['-d /dev/vdb vol-0000000e'] \ No newline at end of file +volumes: ['-d /dev/vdb vol-0000000e'] diff --git a/inventory/host_vars/209.132.184.165 b/inventory/host_vars/209.132.184.165 index e2d1513b34..10764a0e69 100644 --- a/inventory/host_vars/209.132.184.165 +++ b/inventory/host_vars/209.132.184.165 @@ -1,7 +1,7 @@ --- instance_type: m1.large -image: $el6_qcow_id -keypair: fedora-admin +image: {{ el6_qcow_id }} +keypair: fedora-admin-20130801 security_group: jenkins zone: nova hostbase: jenkins-el6 diff --git a/inventory/host_vars/209.132.184.166 b/inventory/host_vars/209.132.184.166 index 32700bfc2b..8676c02401 100644 --- a/inventory/host_vars/209.132.184.166 +++ b/inventory/host_vars/209.132.184.166 @@ -1,11 +1,10 @@ --- instance_type: m1.large -image: $f18_qcow_id -keypair: fedora-admin +image: {{ f18_qcow_id }} +keypair: fedora-admin-20130801 security_group: jenkins zone: nova hostbase: jenkins-f18 public_ip: 209.132.184.166 root_auth_users: pingou description: jenkins f18 worker/slave - diff --git a/inventory/host_vars/209.132.184.209 b/inventory/host_vars/209.132.184.209 index 09af02d87f..e4c983e535 100644 --- a/inventory/host_vars/209.132.184.209 +++ b/inventory/host_vars/209.132.184.209 @@ -1,6 +1,6 @@ --- instance_type: m1.xlarge -image: $f20_qcow_id +image: {{ f20_qcow_id }} keypair: fedora-admin-20130801 security_group: jenkins zone: nova @@ -8,4 +8,3 @@ hostbase: jenkins-f20 public_ip: 209.132.184.209 root_auth_users: pingou description: jenkins f20 worker/slave - diff --git a/inventory/host_vars/blockerbugs-dev.cloud.fedoraproject.org b/inventory/host_vars/blockerbugs-dev.cloud.fedoraproject.org index ba0a61a209..e123d1265d 100644 --- a/inventory/host_vars/blockerbugs-dev.cloud.fedoraproject.org +++ b/inventory/host_vars/blockerbugs-dev.cloud.fedoraproject.org @@ -1,6 +1,6 @@ --- instance_type: m1.medium -image: ${el6_qcow_id} +image: {{ el6_qcow_id }} keypair: fedora-admin security_group: webserver zone: nova diff --git a/inventory/host_vars/buildvm-04.phx2.fedoraproject.org b/inventory/host_vars/buildvm-04.phx2.fedoraproject.org index dda5fe82fa..2cc316bf55 100644 --- a/inventory/host_vars/buildvm-04.phx2.fedoraproject.org +++ b/inventory/host_vars/buildvm-04.phx2.fedoraproject.org @@ -1,7 +1,6 @@ --- vmhost: buildvmhost-10.phx2.fedoraproject.org eth0_ip: 10.5.125.101 - eth1_ip: 10.5.127.161 mem_size: 10240 diff --git a/inventory/host_vars/buildvm-05.phx2.fedoraproject.org b/inventory/host_vars/buildvm-05.phx2.fedoraproject.org index ab1f66e54c..7d57665fb5 100644 --- a/inventory/host_vars/buildvm-05.phx2.fedoraproject.org +++ b/inventory/host_vars/buildvm-05.phx2.fedoraproject.org @@ -1,7 +1,6 @@ --- vmhost: buildvmhost-10.phx2.fedoraproject.org eth0_ip: 10.5.125.102 - eth1_ip: 10.5.127.162 mem_size: 10240 diff --git a/inventory/host_vars/buildvm-06.phx2.fedoraproject.org b/inventory/host_vars/buildvm-06.phx2.fedoraproject.org index 2e3062c56e..bb3dc656f9 100644 --- a/inventory/host_vars/buildvm-06.phx2.fedoraproject.org +++ b/inventory/host_vars/buildvm-06.phx2.fedoraproject.org @@ -1,7 +1,6 @@ --- vmhost: buildvmhost-10.phx2.fedoraproject.org eth0_ip: 10.5.125.103 - eth1_ip: 10.5.127.163 mem_size: 10240 diff --git a/inventory/host_vars/buildvm-07.phx2.fedoraproject.org b/inventory/host_vars/buildvm-07.phx2.fedoraproject.org index 4b2272d3c0..3db614ea06 100644 --- a/inventory/host_vars/buildvm-07.phx2.fedoraproject.org +++ b/inventory/host_vars/buildvm-07.phx2.fedoraproject.org @@ -1,9 +1,6 @@ --- - vmhost: buildvmhost-10.phx2.fedoraproject.org - eth0_ip: 10.5.125.104 - eth1_ip: 10.5.127.164 mem_size: 10240 diff --git a/inventory/host_vars/buildvm-08.phx2.fedoraproject.org b/inventory/host_vars/buildvm-08.phx2.fedoraproject.org index 25442a1c18..9991210945 100644 --- a/inventory/host_vars/buildvm-08.phx2.fedoraproject.org +++ b/inventory/host_vars/buildvm-08.phx2.fedoraproject.org @@ -1,9 +1,6 @@ --- - vmhost: buildvmhost-10.phx2.fedoraproject.org - eth0_ip: 10.5.125.105 - eth1_ip: 10.5.127.165 mem_size: 10240 diff --git a/inventory/host_vars/buildvm-09.phx2.fedoraproject.org b/inventory/host_vars/buildvm-09.phx2.fedoraproject.org index c429729a90..89d9104e3e 100644 --- a/inventory/host_vars/buildvm-09.phx2.fedoraproject.org +++ b/inventory/host_vars/buildvm-09.phx2.fedoraproject.org @@ -1,9 +1,6 @@ --- - vmhost: buildvmhost-10.phx2.fedoraproject.org - eth0_ip: 10.5.125.106 - eth1_ip: 10.5.127.166 mem_size: 10240 diff --git a/inventory/host_vars/buildvm-10.phx2.fedoraproject.org b/inventory/host_vars/buildvm-10.phx2.fedoraproject.org index 95124c946b..0150f7fe86 100644 --- a/inventory/host_vars/buildvm-10.phx2.fedoraproject.org +++ b/inventory/host_vars/buildvm-10.phx2.fedoraproject.org @@ -1,7 +1,4 @@ --- - vmhost: buildvmhost-04.phx2.fedoraproject.org - eth0_ip: 10.5.125.107 - eth1_ip: 10.5.127.167 diff --git a/inventory/host_vars/buildvm-11.phx2.fedoraproject.org b/inventory/host_vars/buildvm-11.phx2.fedoraproject.org index 2d13163dc4..9397e07535 100644 --- a/inventory/host_vars/buildvm-11.phx2.fedoraproject.org +++ b/inventory/host_vars/buildvm-11.phx2.fedoraproject.org @@ -1,7 +1,4 @@ --- - vmhost: buildvmhost-04.phx2.fedoraproject.org - eth0_ip: 10.5.125.108 - eth1_ip: 10.5.127.168 diff --git a/inventory/host_vars/buildvm-12.phx2.fedoraproject.org b/inventory/host_vars/buildvm-12.phx2.fedoraproject.org index 03e8794e9c..a68a5a33c1 100644 --- a/inventory/host_vars/buildvm-12.phx2.fedoraproject.org +++ b/inventory/host_vars/buildvm-12.phx2.fedoraproject.org @@ -1,7 +1,4 @@ --- - vmhost: buildvmhost-04.phx2.fedoraproject.org - eth0_ip: 10.5.125.109 - eth1_ip: 10.5.127.169 diff --git a/inventory/host_vars/buildvm-13.phx2.fedoraproject.org b/inventory/host_vars/buildvm-13.phx2.fedoraproject.org index a0ec869fff..90711281fe 100644 --- a/inventory/host_vars/buildvm-13.phx2.fedoraproject.org +++ b/inventory/host_vars/buildvm-13.phx2.fedoraproject.org @@ -1,7 +1,4 @@ --- - vmhost: buildvmhost-05.phx2.fedoraproject.org - eth0_ip: 10.5.125.110 - eth1_ip: 10.5.127.170 diff --git a/inventory/host_vars/buildvm-14.phx2.fedoraproject.org b/inventory/host_vars/buildvm-14.phx2.fedoraproject.org index 0fb63496c5..3ec25bd5ea 100644 --- a/inventory/host_vars/buildvm-14.phx2.fedoraproject.org +++ b/inventory/host_vars/buildvm-14.phx2.fedoraproject.org @@ -1,7 +1,4 @@ --- - vmhost: buildvmhost-05.phx2.fedoraproject.org - eth0_ip: 10.5.125.111 - eth1_ip: 10.5.127.171 diff --git a/inventory/host_vars/buildvm-15.phx2.fedoraproject.org b/inventory/host_vars/buildvm-15.phx2.fedoraproject.org index 837d3b591f..c5df877a18 100644 --- a/inventory/host_vars/buildvm-15.phx2.fedoraproject.org +++ b/inventory/host_vars/buildvm-15.phx2.fedoraproject.org @@ -1,7 +1,4 @@ --- - vmhost: buildvmhost-05.phx2.fedoraproject.org - eth0_ip: 10.5.125.112 - eth1_ip: 10.5.127.172 diff --git a/inventory/host_vars/buildvm-16.phx2.fedoraproject.org b/inventory/host_vars/buildvm-16.phx2.fedoraproject.org index aa024e1a95..a2d36687b4 100644 --- a/inventory/host_vars/buildvm-16.phx2.fedoraproject.org +++ b/inventory/host_vars/buildvm-16.phx2.fedoraproject.org @@ -1,9 +1,7 @@ --- - vmhost: buildvmhost-06.phx2.fedoraproject.org mem_size: 12288 num_cpus: 3 lvm_size: 130000 eth0_ip: 10.5.125.113 - eth1_ip: 10.5.127.173 diff --git a/inventory/host_vars/buildvm-17.phx2.fedoraproject.org b/inventory/host_vars/buildvm-17.phx2.fedoraproject.org index e77b53b17d..33e1fca43e 100644 --- a/inventory/host_vars/buildvm-17.phx2.fedoraproject.org +++ b/inventory/host_vars/buildvm-17.phx2.fedoraproject.org @@ -1,9 +1,7 @@ --- - vmhost: buildvmhost-06.phx2.fedoraproject.org mem_size: 8192 num_cpus: 3 lvm_size: 130000 eth0_ip: 10.5.125.140 - eth1_ip: 10.5.127.174 diff --git a/inventory/host_vars/buildvm-18.phx2.fedoraproject.org b/inventory/host_vars/buildvm-18.phx2.fedoraproject.org index c541f86c8d..7643d1e4ff 100644 --- a/inventory/host_vars/buildvm-18.phx2.fedoraproject.org +++ b/inventory/host_vars/buildvm-18.phx2.fedoraproject.org @@ -1,7 +1,4 @@ --- - vmhost: buildvmhost-07.phx2.fedoraproject.org - eth0_ip: 10.5.125.141 - eth1_ip: 10.5.127.175 diff --git a/inventory/host_vars/buildvm-19.phx2.fedoraproject.org b/inventory/host_vars/buildvm-19.phx2.fedoraproject.org index 0f6a63044c..04a975034f 100644 --- a/inventory/host_vars/buildvm-19.phx2.fedoraproject.org +++ b/inventory/host_vars/buildvm-19.phx2.fedoraproject.org @@ -1,7 +1,4 @@ --- - vmhost: buildvmhost-07.phx2.fedoraproject.org - eth0_ip: 10.5.125.142 - eth1_ip: 10.5.127.176 diff --git a/inventory/host_vars/buildvm-20.phx2.fedoraproject.org b/inventory/host_vars/buildvm-20.phx2.fedoraproject.org index b1f91a032e..88a3f087e4 100644 --- a/inventory/host_vars/buildvm-20.phx2.fedoraproject.org +++ b/inventory/host_vars/buildvm-20.phx2.fedoraproject.org @@ -1,7 +1,4 @@ --- - vmhost: buildvmhost-07.phx2.fedoraproject.org - eth0_ip: 10.5.125.143 - eth1_ip: 10.5.127.177 diff --git a/inventory/host_vars/buildvm-21.phx2.fedoraproject.org b/inventory/host_vars/buildvm-21.phx2.fedoraproject.org index 35641c5d7a..b5ee105aba 100644 --- a/inventory/host_vars/buildvm-21.phx2.fedoraproject.org +++ b/inventory/host_vars/buildvm-21.phx2.fedoraproject.org @@ -1,7 +1,4 @@ --- - vmhost: buildvmhost-08.phx2.fedoraproject.org - eth0_ip: 10.5.125.144 - eth1_ip: 10.5.127.178 diff --git a/inventory/host_vars/buildvm-22.phx2.fedoraproject.org b/inventory/host_vars/buildvm-22.phx2.fedoraproject.org index 74af27232f..90699a9e40 100644 --- a/inventory/host_vars/buildvm-22.phx2.fedoraproject.org +++ b/inventory/host_vars/buildvm-22.phx2.fedoraproject.org @@ -1,7 +1,4 @@ --- - vmhost: buildvmhost-08.phx2.fedoraproject.org - eth0_ip: 10.5.125.145 - eth1_ip: 10.5.127.179 diff --git a/inventory/host_vars/buildvm-23.phx2.fedoraproject.org b/inventory/host_vars/buildvm-23.phx2.fedoraproject.org index ac094a7d4c..c53dba2b0e 100644 --- a/inventory/host_vars/buildvm-23.phx2.fedoraproject.org +++ b/inventory/host_vars/buildvm-23.phx2.fedoraproject.org @@ -1,7 +1,4 @@ --- - vmhost: buildvmhost-08.phx2.fedoraproject.org - eth0_ip: 10.5.125.146 - eth1_ip: 10.5.127.180 diff --git a/inventory/host_vars/buildvm-24.phx2.fedoraproject.org b/inventory/host_vars/buildvm-24.phx2.fedoraproject.org index 6be63bec52..3185040cf1 100644 --- a/inventory/host_vars/buildvm-24.phx2.fedoraproject.org +++ b/inventory/host_vars/buildvm-24.phx2.fedoraproject.org @@ -1,7 +1,4 @@ --- - vmhost: buildvmhost-09.phx2.fedoraproject.org - eth0_ip: 10.5.125.147 - eth1_ip: 10.5.127.181 diff --git a/inventory/host_vars/buildvm-25.phx2.fedoraproject.org b/inventory/host_vars/buildvm-25.phx2.fedoraproject.org index 0396fd99d3..2b1f96f364 100644 --- a/inventory/host_vars/buildvm-25.phx2.fedoraproject.org +++ b/inventory/host_vars/buildvm-25.phx2.fedoraproject.org @@ -1,7 +1,5 @@ --- - vmhost: buildvmhost-09.phx2.fedoraproject.org - eth0_ip: 10.5.125.148 eth1_ip: 10.5.127.182 diff --git a/inventory/host_vars/buildvm-26.phx2.fedoraproject.org b/inventory/host_vars/buildvm-26.phx2.fedoraproject.org index c2b9b947ce..3913d995d4 100644 --- a/inventory/host_vars/buildvm-26.phx2.fedoraproject.org +++ b/inventory/host_vars/buildvm-26.phx2.fedoraproject.org @@ -1,7 +1,4 @@ --- - vmhost: buildvmhost-09.phx2.fedoraproject.org - eth0_ip: 10.5.125.149 - eth1_ip: 10.5.127.183 diff --git a/inventory/host_vars/buildvm-27.phx2.fedoraproject.org b/inventory/host_vars/buildvm-27.phx2.fedoraproject.org index 24c48fc11e..e623d0e861 100644 --- a/inventory/host_vars/buildvm-27.phx2.fedoraproject.org +++ b/inventory/host_vars/buildvm-27.phx2.fedoraproject.org @@ -1,9 +1,6 @@ --- - vmhost: buildvmhost-10.phx2.fedoraproject.org - eth0_ip: 10.5.125.150 - eth1_ip: 10.5.127.184 mem_size: 10240 diff --git a/inventory/host_vars/copr-be-dev.cloud.fedoraproject.org b/inventory/host_vars/copr-be-dev.cloud.fedoraproject.org index 24127d51bb..6deb6b6801 100644 --- a/inventory/host_vars/copr-be-dev.cloud.fedoraproject.org +++ b/inventory/host_vars/copr-be-dev.cloud.fedoraproject.org @@ -1,6 +1,6 @@ --- instance_type: m1.xlarge -image: $f19_qcow_id +image: {{ f19_qcow_id }} keypair: fedora-admin-20130801 security_group: webserver zone: nova diff --git a/inventory/host_vars/copr-fe-dev.cloud.fedoraproject.org b/inventory/host_vars/copr-fe-dev.cloud.fedoraproject.org index eb3f6c1376..4e2a7b66f1 100644 --- a/inventory/host_vars/copr-fe-dev.cloud.fedoraproject.org +++ b/inventory/host_vars/copr-fe-dev.cloud.fedoraproject.org @@ -1,6 +1,6 @@ --- instance_type: m1.medium -image: ${f19_qcow_id} +image: {{ f19_qcow_id }} keypair: fedora-admin-20130801 security_group: webserver zone: nova diff --git a/inventory/host_vars/hrf.cloud.fedoraproject.org b/inventory/host_vars/hrf.cloud.fedoraproject.org index 139b9f1357..077b0a8c0a 100644 --- a/inventory/host_vars/hrf.cloud.fedoraproject.org +++ b/inventory/host_vars/hrf.cloud.fedoraproject.org @@ -1,7 +1,7 @@ --- instance_type: m1.small -image: $el6_qcow_id -keypair: fedora-admin +image: {{ el6_qcow_id }} +keypair: fedora-admin-20130801 security_group: webserver zone: nova hostbase: hrf- diff --git a/inventory/host_vars/jenkins.cloud.fedoraproject.org b/inventory/host_vars/jenkins.cloud.fedoraproject.org index f4f105b535..b9cb67b4cb 100644 --- a/inventory/host_vars/jenkins.cloud.fedoraproject.org +++ b/inventory/host_vars/jenkins.cloud.fedoraproject.org @@ -1,7 +1,7 @@ --- instance_type: m1.small -image: $el6_qcow_id -hkeypair: fedora-admin +image: {{ el6_qcow_id }} +hkeypair: fedora-admin-20130801 security_group: jenkins zone: nova hostbase: jenkins-master- diff --git a/inventory/host_vars/lists-dev.cloud.fedoraproject.org b/inventory/host_vars/lists-dev.cloud.fedoraproject.org index 498e64eba3..c06aad06ed 100644 --- a/inventory/host_vars/lists-dev.cloud.fedoraproject.org +++ b/inventory/host_vars/lists-dev.cloud.fedoraproject.org @@ -1,7 +1,7 @@ --- instance_type: m1.small -image: $f18_qcow_id -keypair: fedora-admin +image: {{ f18_qcow_id }} +keypair: fedora-admin-20130801 security_group: smtpserver zone: nova hostbase: lists-dev-