Merge "Simplify networking for MR swift"

tests/host_vars/infraMR.yml

@@ -21,3 +21,6 @@ container_networks:
     interface: "eth1"
     netmask: "255.255.255.0"
     type: "veth"
+    static_routes:
+      - cidr: "10.1.11.0/24"
+        gateway: "10.1.1.1"

tests/host_vars/swift-storageA1.yml

@@ -15,7 +15,7 @@
 
 ansible_host: 10.1.1.103
 storage_address: 10.1.2.103
-replication_address: 10.1.3.103
+replication_address: 10.1.2.103
 container_networks:
   management_address:
     address: "{{ ansible_host }}"
@@ -35,12 +35,3 @@ container_networks:
     static_routes:
       - cidr: "10.1.12.0/24"
         gateway: "10.1.2.1"
-  replication_address:
-    address: "{{ replication_address }}"
-    bridge: "br-replA"
-    interface: "eth3"
-    netmask: "255.255.255.0"
-    type: "veth"
-    static_routes:
-      - cidr: "10.1.13.0/24"
-        gateway: "10.1.3.1"

tests/host_vars/swift-storageA2.yml

@@ -15,7 +15,7 @@
 
 ansible_host: 10.1.1.104
 storage_address: 10.1.2.104
-replication_address: 10.1.3.104
+replication_address: 10.1.2.104
 container_networks:
   management_address:
     address: "{{ ansible_host }}"
@@ -35,12 +35,3 @@ container_networks:
     static_routes:
       - cidr: "10.1.12.0/24"
         gateway: "10.1.2.1"
-  replication_address:
-    address: "{{ replication_address }}"
-    bridge: "br-replA"
-    interface: "eth3"
-    netmask: "255.255.255.0"
-    type: "veth"
-    static_routes:
-      - cidr: "10.1.13.0/24"
-        gateway: "10.1.3.1"

tests/host_vars/swift-storageB1.yml

@@ -15,7 +15,7 @@
 
 ansible_host: 10.1.11.103
 storage_address: 10.1.12.103
-replication_address: 10.1.13.103
+replication_address: 10.1.12.103
 container_networks:
   management_address:
     address: "{{ ansible_host }}"
@@ -35,12 +35,3 @@ container_networks:
     static_routes:
       - cidr: "10.1.2.0/24"
         gateway: "10.1.12.1"
-  replication_address:
-    address: "{{ replication_address }}"
-    bridge: "br-replB"
-    interface: "eth3"
-    netmask: "255.255.255.0"
-    type: "veth"
-    static_routes:
-      - cidr: "10.1.3.0/24"
-        gateway: "10.1.13.1"

tests/host_vars/swift-storageB2.yml

@@ -15,7 +15,7 @@
 
 ansible_host: 10.1.11.104
 storage_address: 10.1.12.104
-replication_address: 10.1.13.104
+replication_address: 10.1.12.104
 container_networks:
   management_address:
     address: "{{ ansible_host }}"
@@ -35,13 +35,3 @@ container_networks:
     static_routes:
       - cidr: "10.1.2.0/24"
         gateway: "10.1.12.1"
-  replication_address:
-    address: "{{ replication_address }}"
-    bridge: "br-replB"
-    interface: "eth3"
-    netmask: "255.255.255.0"
-    type: "veth"
-    static_routes:
-      - cidr: "10.1.3.0/24"
-        gateway: "10.1.13.1"
-

tests/swift-overrides-MR-A.yml

@@ -19,13 +19,10 @@ bridges:
     ip_addr: "10.1.1.1"
   - name: "br-storageA"
     ip_addr: "10.1.2.1"
-  - name: "br-replA"
-    ip_addr: "10.1.3.1"
   - name: "br-mgmtB"
     ip_addr: "10.1.11.1"
   - name: "br-storageB"
     ip_addr: "10.1.12.1"
-  - name: "br-replB"
-    ip_addr: "10.1.13.1"
 
 test_swift_region: 1
+test_swift_repl_network: "eth2"

tests/swift-overrides-MR-B.yml

@@ -14,3 +14,4 @@
 # limitations under the License.
 
 test_swift_region: 2
+test_swift_repl_network: "eth2"