diff options
| author |   Michal Skalski <mskalski@mirantis.com> | 2016-08-10 18:38:33 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-08-10 18:38:33 +0000 |
| commit | 748b18088106826dd9cc9a26d26e1aa359ff67b6 (patch) | |
| tree | 604942cbeb7c790ba9cec1a131cb867e73c5bd65 | |
| parent | 737faf25aa743d54ae7f458f54d880d80aefcc6d (diff) | |
| parent | dd0ec92635f3fe60a170be094f4148542372b7e6 (diff) | |
Merge "Provide access to mgmt network from host level"
4 files changed, 25 insertions, 24 deletions
diff --git a/deploy/config/labs/devel-pipeline/default/fuel/config/dea-pod-override.yaml b/deploy/config/labs/devel-pipeline/default/fuel/config/dea-pod-override.yaml index afe5daf21..985a2920c 100644 --- a/deploy/config/labs/devel-pipeline/default/fuel/config/dea-pod-override.yaml +++ b/deploy/config/labs/devel-pipeline/default/fuel/config/dea-pod-override.yaml @@ -18,9 +18,9 @@ environment: interfaces_1: ens3: - fuelweb_admin - - management - ens4: - storage + ens4: + - management ens5: - private ens6: @@ -51,10 +51,10 @@ transformations_1: name: ens3 - action: add-port bridge: br-mgmt - name: ens3.101 + name: ens4 - action: add-port bridge: br-storage - name: ens4.102 + name: ens3.102 - action: add-port bridge: br-mesh name: ens5.103 @@ -119,22 +119,22 @@ network: gateway: null ip_ranges: - - 192.168.0.1 - - 192.168.0.254 + - 192.168.0.253 meta: cidr: 192.168.0.0/24 configurable: true map_priority: 2 name: management - notation: cidr + notation: ip_ranges render_addr_mask: internal render_type: cidr use_gateway: false vips: - haproxy - vrouter - vlan_start: 101 + vlan_start: null name: management - vlan_start: 101 + vlan_start: null - cidr: 192.168.2.0/24 gateway: null ip_ranges: diff --git a/deploy/config/labs/devel-pipeline/elx/fuel/config/dea-pod-override.yaml b/deploy/config/labs/devel-pipeline/elx/fuel/config/dea-pod-override.yaml index 6405db6b9..ce3b62af9 100644 --- a/deploy/config/labs/devel-pipeline/elx/fuel/config/dea-pod-override.yaml +++ b/deploy/config/labs/devel-pipeline/elx/fuel/config/dea-pod-override.yaml @@ -18,9 +18,9 @@ environment: interfaces_1: ens3: - fuelweb_admin - - management - ens4: - storage + ens4: + - management ens5: - private ens6: @@ -51,10 +51,10 @@ transformations_1: name: ens3 - action: add-port bridge: br-mgmt - name: ens3.101 + name: ens4 - action: add-port bridge: br-storage - name: ens4.102 + name: ens3.102 - action: add-port bridge: br-mesh name: ens5.103 @@ -118,22 +118,22 @@ network: gateway: null ip_ranges: - - 192.168.0.1 - - 192.168.0.254 + - 192.168.0.253 meta: cidr: 192.168.0.0/24 configurable: true map_priority: 2 name: management - notation: cidr + notation: ip_ranges render_addr_mask: internal render_type: cidr use_gateway: false vips: - haproxy - vrouter - vlan_start: 101 + vlan_start: null name: management - vlan_start: 101 + vlan_start: null - cidr: 192.168.2.0/24 gateway: null ip_ranges: diff --git a/deploy/config/labs/devel-pipeline/huawei-ch/fuel/config/dea-pod-override.yaml b/deploy/config/labs/devel-pipeline/huawei-ch/fuel/config/dea-pod-override.yaml index c5b94a544..736e9af3c 100644 --- a/deploy/config/labs/devel-pipeline/huawei-ch/fuel/config/dea-pod-override.yaml +++ b/deploy/config/labs/devel-pipeline/huawei-ch/fuel/config/dea-pod-override.yaml @@ -18,9 +18,9 @@ environment: interfaces_1: ens3: - fuelweb_admin - - management - ens4: - storage + ens4: + - management ens5: - private ens6: @@ -51,10 +51,10 @@ transformations_1: name: ens3 - action: add-port bridge: br-mgmt - name: ens3.101 + name: ens4 - action: add-port bridge: br-storage - name: ens4.102 + name: ens3.102 - action: add-port bridge: br-mesh name: ens5.103 @@ -118,22 +118,22 @@ network: gateway: null ip_ranges: - - 192.168.0.1 - - 192.168.0.254 + - 192.168.0.253 meta: cidr: 192.168.0.0/24 configurable: true map_priority: 2 name: management - notation: cidr + notation: ip_ranges render_addr_mask: internal render_type: cidr use_gateway: false vips: - haproxy - vrouter - vlan_start: 101 + vlan_start: null name: management - vlan_start: 101 + vlan_start: null - cidr: 192.168.2.0/24 gateway: null ip_ranges: diff --git a/deploy/templates/virtual_environment/networks/fuel2.xml b/deploy/templates/virtual_environment/networks/fuel2.xml index 615c92094..558788664 100644 --- a/deploy/templates/virtual_environment/networks/fuel2.xml +++ b/deploy/templates/virtual_environment/networks/fuel2.xml @@ -1,5 +1,6 @@ <network> <name>fuel2</name> <bridge name='fuel2' stp='on' delay='0'/> + <ip address='192.168.0.254' netmask='255.255.255.0'/> </network> |