summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndy Doan <andy.doan@linaro.org>2016-06-17 11:20:02 -0500
committerAndy Doan <andy.doan@linaro.org>2016-06-17 11:20:02 -0500
commitf35522dd1339fabfecbfb1523f9c72ceee09186d (patch)
tree79c9d17109fd698d24906bf3a9b4aef395a5e6b3
parent4472681c6200eb2ce59f3cab1d5c9c9b409f00de (diff)
downloadansible-playbooks-f35522dd1339fabfecbfb1523f9c72ceee09186d.tar.gz
colo: let qa team use r3-a1 with normal grub
Change-Id: I6f3f61a10c97be10e61c01c2ca48d5e9c9ca12a7
-rw-r--r--host_vars/aus-colo.linaro.org1
-rw-r--r--reservations.yml5
-rw-r--r--roles/colo-router/templates/router-dnsmasq.j21
3 files changed, 4 insertions, 3 deletions
diff --git a/host_vars/aus-colo.linaro.org b/host_vars/aus-colo.linaro.org
index 0b4ebd2..c0ac0c5 100644
--- a/host_vars/aus-colo.linaro.org
+++ b/host_vars/aus-colo.linaro.org
@@ -297,7 +297,6 @@ r3_hosts:
name: r3-a1
ip: 10.30.100.1
pxe: true
- tag: rack3q
- mac: "8c:fd:f0:01:75:01"
name: r3-a1-bmc
ip: 10.30.101.1
diff --git a/reservations.yml b/reservations.yml
index 3b6bf8e..7328ebc 100644
--- a/reservations.yml
+++ b/reservations.yml
@@ -39,7 +39,10 @@ reservations:
- hosts: [r2-a7]
users: [ricardo.salveti]
- - hosts: [r3-a1, r3-a2, r3-a3]
+ - hosts: [r3-a1]
+ users: [andy.doan, ricardo.salveti, milosz.wasilewski, naresh.kamboju, chase.qi]
+
+ - hosts: [r3-a2, r3-a3]
users: [ricardo.salveti, amit.kucheria, graeme.gregory, ard.biesheuvel, andy.doan, ashwin.chaugule]
- hosts: [r2-a8, r2-a12]
diff --git a/roles/colo-router/templates/router-dnsmasq.j2 b/roles/colo-router/templates/router-dnsmasq.j2
index b879507..912f2ce 100644
--- a/roles/colo-router/templates/router-dnsmasq.j2
+++ b/roles/colo-router/templates/router-dnsmasq.j2
@@ -47,4 +47,3 @@ dhcp-boot=tag:rack1,pxelinux.0,r1-maas-server,10.10.0.20
dhcp-boot=tag:rack2,/pxelinux/grubaa64.efi,r2-x86-1,10.20.0.20
dhcp-boot=tag:rack3,/pxelinux/bootnetaa64.efi,r2-x86-1,10.20.0.20
dhcp-boot=tag:rack3x,/pxelinux/bootnetx64.efi,r2-x86-1,10.20.0.20
-dhcp-boot=tag:rack3q,/pxelinux/grub-qcom.efi,r2-x86-1,10.20.0.20