Merge lp:~junaidali/charms/trusty/plumgrid-gateway/trunk into lp:~plumgrid-team/charms/trusty/plumgrid-gateway/trunk

Proposed by Junaid Ali on 2016-06-16
Status: Merged
Merged at revision: 30
Proposed branch: lp:~junaidali/charms/trusty/plumgrid-gateway/trunk
Merge into: lp:~plumgrid-team/charms/trusty/plumgrid-gateway/trunk
Diff against target: 62 lines (+2/-19)
3 files modified
config.yaml (+1/-11)
hooks/pg_gw_utils.py (+1/-7)
templates/kilo/ifcs.conf (+0/-1)
To merge this branch: bzr merge lp:~junaidali/charms/trusty/plumgrid-gateway/trunk
Reviewer Review Type Date Requested Status
Bilal Baqar 2016-06-16 Approve on 2016-06-19
Review via email: mp+297607@code.launchpad.net
To post a comment you must log in.
31. By Junaid Ali on 2016-06-19

Changes:
 Updated fabric-interfaces config description
 Removed unused imports

Bilal Baqar (bbaqar) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'config.yaml'
2--- config.yaml 2015-11-22 03:26:23 +0000
3+++ config.yaml 2016-06-19 18:55:17 +0000
4@@ -13,22 +13,12 @@
5 type: string
6 default: 'juju-br0'
7 description: The interface connected to PLUMgrid Managment network.
8- os-data-network:
9- type: string
10- default:
11- description: |
12- The IP address and netmask of the OpenStack Data network (e.g.,
13- 192.168.0.0/24)
14- .
15- This network will be used for tenant network traffic in overlay
16- networks.
17 fabric-interfaces:
18 default: 'MANAGEMENT'
19 type: string
20 description: |
21 Interfaces that will provide fabric connectivity on the gateway nodes.
22- Provided in form of json in a string. These interfaces have to be connected
23- to the os-data-network specified in the config. Default value is MANAGEMENT which
24+ Provided in form of json in a string. Default value is MANAGEMENT which
25 will configure the management interface as the fabric interface on each
26 director.
27 network-device-mtu:
28
29=== modified file 'hooks/pg_gw_utils.py'
30--- hooks/pg_gw_utils.py 2016-05-23 10:31:14 +0000
31+++ hooks/pg_gw_utils.py 2016-06-19 18:55:17 +0000
32@@ -23,8 +23,6 @@
33 get_iface_from_addr,
34 get_bridges,
35 get_bridge_nics,
36- is_address_in_network,
37- get_iface_addr
38 )
39 from charmhelpers.core.host import (
40 write_file,
41@@ -268,11 +266,7 @@
42 else:
43 raise ValueError('No fabric interface provided for node')
44 if interface_exists(node_fabric_interface):
45- if is_address_in_network(config('os-data-network'),
46- get_iface_addr(node_fabric_interface)[0]):
47- return node_fabric_interface
48- else:
49- raise ValueError('Fabric interface not in fabric network')
50+ return node_fabric_interface
51 else:
52 log('Provided fabric interface %s does not exist'
53 % node_fabric_interface)
54
55=== modified file 'templates/kilo/ifcs.conf'
56--- templates/kilo/ifcs.conf 2016-05-21 11:54:18 +0000
57+++ templates/kilo/ifcs.conf 2016-06-19 18:55:17 +0000
58@@ -4,4 +4,3 @@
59 {{ dev }} = access_phys
60 {% endfor -%}
61 {% endif -%}
62-

Subscribers

People subscribed via source and target branches