diff options
| author | Andy Doan <andy.doan@linaro.org> | 2015-06-25 21:08:28 -0500 |
|---|---|---|
| committer | Andy Doan <andy.doan@linaro.org> | 2015-06-25 21:08:28 -0500 |
| commit | f8a187813efd630f76ad797ac4899ada273dc58a (patch) | |
| tree | 6e561a2dd306936c0d96dd47422a30ea3957a138 | |
| parent | bd928707dc2550c38f0bbaa99bc715be8ad2e5f4 (diff) | |
fixes to differences in deployed colo
somehow this got out of sync
Change-Id: I7ccc8adb4cd01f39470ac03d5d0dbc4f3a10dcb3
| -rw-r--r-- | host_vars/aus-colo.linaro.org | 8 | ||||
| -rw-r--r-- | roles/colo-router/tasks/main.yml | 2 |
2 files changed, 4 insertions, 6 deletions
diff --git a/host_vars/aus-colo.linaro.org b/host_vars/aus-colo.linaro.org index 2d948cf3..d12df5b1 100644 --- a/host_vars/aus-colo.linaro.org +++ b/host_vars/aus-colo.linaro.org @@ -98,6 +98,9 @@ r1_hosts: - mac: 00:01:73:02:1e:1c name: r2-a17 ip: 10.10.0.217 + - name: r2-a18 + mac: 00:01:73:02:19:ac + ip: 10.10.0.218 - mac: 00:01:73:02:1a:a4 name: r2-a19 ip: 10.10.0.219 @@ -180,11 +183,6 @@ r2_hosts: mac: 00:01:73:02:1e:08 pxe: true - - name: r2-a18 - mac: 00:01:73:02:19:ac - ip: 10.20.100.18 - pxe: true - - name: r2-a30 ip: 10.20.200.1 mac: 00:00:1a:1b:6b:16 diff --git a/roles/colo-router/tasks/main.yml b/roles/colo-router/tasks/main.yml index b45498a3..088931df 100644 --- a/roles/colo-router/tasks/main.yml +++ b/roles/colo-router/tasks/main.yml @@ -14,7 +14,7 @@ - name: Install fixed version of squid3 shell: "apt-get install -y libnettle4 libdb5.1 && curl -o /tmp/squid3_common.deb http://ftp.de.debian.org/debian/pool/main/s/squid3/squid3-common_3.4.8-5~bpo70+1_all.deb && curl -o /tmp/squid3.deb http://ftp.de.debian.org/debian/pool/main/s/squid3/squid3_3.4.8-5~bpo70+1_amd64.deb && dpkg -i /tmp/squid3_common.deb /tmp/squid3.deb && rm /tmp/squid3.deb /tmp/squid3_common.deb" - when: squid_ver.rc == 0 + when: squid_ver is defined and squid_ver.rc == 0 - name: Configure squid proxy server lineinfile: dest=/etc/squid3/squid.conf backup=yes |