diff options
| author | Andy Doan <andy.doan@linaro.org> | 2016-01-26 22:12:54 -0600 |
|---|---|---|
| committer | Andy Doan <andy.doan@linaro.org> | 2016-01-26 22:12:54 -0600 |
| commit | 8ab11d4c24848cb5e38cb22ab66ac4bbe19dc040 (patch) | |
| tree | 3e648a3e59d75ff6eadabfb89d6149e62e041dee /roles/colo-router | |
| parent | acb777b749592214abc7fbae68cbd4325745115f (diff) | |
colo: move moonshot to rack3
Change-Id: Idb79862b3762a6743f67dc670fee298aaae84eaa
Diffstat (limited to 'roles/colo-router')
| -rw-r--r-- | roles/colo-router/files/iptables | 2 | ||||
| -rw-r--r-- | roles/colo-router/files/router-interfaces | 14 | ||||
| -rw-r--r-- | roles/colo-router/templates/pdu_power.conf.j2 | 16 |
3 files changed, 20 insertions, 12 deletions
diff --git a/roles/colo-router/files/iptables b/roles/colo-router/files/iptables index 01bce6b6..4fda4f76 100644 --- a/roles/colo-router/files/iptables +++ b/roles/colo-router/files/iptables @@ -4,7 +4,7 @@ set -e ext=em2 -subnets="10.10.0.0/16 10.100.0.0/16 10.20.0.0/16 10.30.0.0/16" +subnets="10.10.0.0/16 10.20.0.0/16 10.30.0.0/16 10.33.0.0/16" modprobe iptable_nat diff --git a/roles/colo-router/files/router-interfaces b/roles/colo-router/files/router-interfaces index f2b6ea16..3943890d 100644 --- a/roles/colo-router/files/router-interfaces +++ b/roles/colo-router/files/router-interfaces @@ -48,13 +48,6 @@ iface em1.10 inet static netmask 255.255.0.0 vlan_raw_device em1 -# vlan 100 -auto em1.100 -iface em1.100 inet static - address 10.100.0.1 - netmask 255.255.0.0 - vlan_raw_device em1 - # vlan 20 auto em1.20 iface em1.20 inet static @@ -69,6 +62,13 @@ iface em1.30 inet static netmask 255.255.0.0 vlan_raw_device em1 +# vlan 33 (for moonshot) +auto em1.33 +iface em1.33 inet static + address 10.33.0.1 + netmask 255.255.0.0 + vlan_raw_device em1 + # vlan 64 (for r1-a1, r1-a2, and r1-a3) auto em1.64 iface em1.64 inet static diff --git a/roles/colo-router/templates/pdu_power.conf.j2 b/roles/colo-router/templates/pdu_power.conf.j2 index a3e36970..034dfddb 100644 --- a/roles/colo-router/templates/pdu_power.conf.j2 +++ b/roles/colo-router/templates/pdu_power.conf.j2 @@ -180,6 +180,14 @@ pdus: user: {{smash_user}} pass: {{smash_pass}} host: r3-a1-bmc + - id: 1-1-5 + label: r3-m1.2 + - id: 1-1-6 + label: r3-m1.1 + - id: 1-2-5 + label: r3-m1.3 + - id: 1-2-6 + label: r3-m1.4 users: - name: andy.doan @@ -193,13 +201,13 @@ users: # users that can manage moonshot equipment - name: clark.laughlin - labels: r1-m1-* + labels: r3-m1-* - name: clark.laughlin - labels: r1-s3 + labels: r3-s2 - name: yazen.ghannam - labels: r1-m1-* + labels: r3-m1-* - name: yazen.ghannam - labels: r1-s3 + labels: r3-s2 # redhat users that help manage rack2 - name: paul.whalen |