Juju Charms Collection
neutron-api package

Merge lp:~seyeongkim/charms/trusty/neutron-api/lp1386911 into lp:~openstack-charmers-archive/charms/trusty/neutron-api/next

  1. Trusty Tahr (14.04)
  2. lp1386911
  3. Merge into next
Proposed by Seyeong Kim
Status: Merged
Merged at revision: 83
Proposed branch: lp:~seyeongkim/charms/trusty/neutron-api/lp1386911
Merge into: lp:~openstack-charmers-archive/charms/trusty/neutron-api/next
Diff against target: 189 lines (+126/-0)
5 files modified
config.yaml (+65/-0)
hooks/neutron_api_context.py (+13/-0)
templates/icehouse/neutron.conf (+13/-0)
templates/kilo/neutron.conf (+13/-0)
unit_tests/test_neutron_api_context.py (+22/-0)
To merge this branch: bzr merge lp:~seyeongkim/charms/trusty/neutron-api/lp1386911
Reviewer Review Type Date Requested Status
Liam Young (community) Approve
OpenStack Charmers Pending
Review via email: mp+249468@code.launchpad.net

This proposal supersedes a proposal from 2015-02-04.

To post a comment you must log in.
Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote : Posted in a previous version of this proposal

charm_lint_check #1559 neutron-api-next for xtrusia mp248474
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/1559/

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote : Posted in a previous version of this proposal

charm_unit_test #1514 neutron-api-next for xtrusia mp248474
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/1514/

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote : Posted in a previous version of this proposal

charm_amulet_test #1637 neutron-api-next for xtrusia mp248474
    AMULET FAIL: amulet-test missing

AMULET Results (max last 2 lines):
INFO:root:Search string not found in makefile target commands.
ERROR:root:No make target was executed.

Full amulet test output: http://paste.ubuntu.com/10046614/
Build: http://10.245.162.77:8080/job/charm_amulet_test/1637/

Revision history for this message
Liam Young (gnuoy) wrote : Posted in a previous version of this proposal

Thanks for this mp Seyeong Kim, this is a great addition to the charm functionality. One small thing, please could you add quota support to the kilo template as well ? I think that the kilo template probably landed after you submitted this mp, so apologies for that.

review: Needs Fixing
Revision history for this message
Seyeong Kim (seyeongkim) wrote :

new options added to kilo

do i need to add this also in config.yaml and neutron.conf for kilo templates?

quota_firewall = 1
quota_firewall_policy = 1
quota_firewall_rule = 100

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_lint_check #1948 neutron-api-next for xtrusia mp249468
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/1948/

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_unit_test #1738 neutron-api-next for xtrusia mp249468
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/1738/

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_amulet_test #1889 neutron-api-next for xtrusia mp249468
    AMULET FAIL: amulet-test missing

AMULET Results (max last 2 lines):
INFO:root:Search string not found in makefile target commands.
ERROR:root:No make target was executed.

Full amulet test output: http://paste.ubuntu.com/10186189/
Build: http://10.245.162.77:8080/job/charm_amulet_test/1889/

lp:~seyeongkim/charms/trusty/neutron-api/lp1386911 updated
78. By Seyeong Kim

rebase 1

79. By Seyeong Kim

rebase 2

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_lint_check #2204 neutron-api-next for xtrusia mp249468
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/2204/

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_unit_test #1993 neutron-api-next for xtrusia mp249468
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/1993/

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_amulet_test #2150 neutron-api-next for xtrusia mp249468
    AMULET FAIL: amulet-test failed

AMULET Results (max last 2 lines):
  ERROR subprocess encountered error code 1
  make: *** [test] Error 1

Full amulet test output: http://paste.ubuntu.com/10396288/
Build: http://10.245.162.77:8080/job/charm_amulet_test/2150/

Revision history for this message
Liam Young (gnuoy) wrote :

Approve

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'config.yaml'
--- config.yaml 2015-01-13 14:43:04 +0000
+++ config.yaml 2015-02-24 11:28:29 +0000
@@ -66,6 +66,71 @@
66 gre66 gre
67 vxlan 67 vxlan
68 .68 .
69 # Quota configuration settings
70 quota-security-group:
71 default: 10
72 type: int
73 description: |
74 Number of security groups allowed per tenant. A negative value means
75 unlimited.
76 quota-security-group-rule:
77 default: 100
78 type: int
79 description: |
80 Number of security group rules allowed per tenant. A negative value means
81 unlimited
82 quota-network:
83 default: 10
84 type: int
85 description: |
86 Number of networks allowed per tenant. A negative value means unlimited.
87 quota-subnet:
88 default: 10
89 type: int
90 description: |
91 Number of subnets allowed per tenant. A negative value means unlimited.
92 quota-port:
93 default: 50
94 type: int
95 description: |
96 Number of ports allowed per tenant. A negative value means unlimited.
97 quota-vip:
98 default: 10
99 type: int
100 description: |
101 Number of vips allowed per tenant. A negative value means unlimited.
102 quota-pool:
103 default: 10
104 type: int
105 description: |
106 Number of pools allowed per tenant. A negative value means unlimited.
107 quota-member:
108 default: -1
109 type: int
110 description: |
111 Number of pool members allowed per tenant. A negative value means unlimited.
112 The default is unlimited because a member is not a real resource consumer
113 on Openstack. However, on back-end, a member is a resource consumer
114 and that is the reason why quota is possible.
115 quota-health-monitors:
116 default: -1
117 type: int
118 description: |
119 Number of health monitors allowed per tenant. A negative value means
120 unlimited.
121 The default is unlimited because a health monitor is not a real resource
122 consumer on Openstack. However, on back-end, a member is a resource consumer
123 and that is the reason why quota is possible.
124 quota-router:
125 default: 10
126 type: int
127 description: |
128 Number of routers allowed per tenant. A negative value means unlimited.
129 quota-floatingip:
130 default: 50
131 type: int
132 description: |
133 Number of floating IPs allowed per tenant. A negative value means unlimited.
69 # HA configuration settings134 # HA configuration settings
70 vip:135 vip:
71 type: string136 type: string
72137
=== modified file 'hooks/neutron_api_context.py'
--- hooks/neutron_api_context.py 2014-11-25 10:19:07 +0000
+++ hooks/neutron_api_context.py 2015-02-24 11:28:29 +0000
@@ -98,6 +98,19 @@
98 ctxt['neutron_bind_port'] = \98 ctxt['neutron_bind_port'] = \
99 determine_api_port(api_port('neutron-server'),99 determine_api_port(api_port('neutron-server'),
100 singlenode_mode=True)100 singlenode_mode=True)
101 ctxt['quota_security_group'] = config('quota-security-group')
102 ctxt['quota_security_group_rule'] = \
103 config('quota-security-group-rule')
104 ctxt['quota_network'] = config('quota-network')
105 ctxt['quota_subnet'] = config('quota-subnet')
106 ctxt['quota_port'] = config('quota-port')
107 ctxt['quota_vip'] = config('quota-vip')
108 ctxt['quota_pool'] = config('quota-pool')
109 ctxt['quota_member'] = config('quota-member')
110 ctxt['quota_health_monitors'] = config('quota-health-monitors')
111 ctxt['quota_router'] = config('quota-router')
112 ctxt['quota_floatingip'] = config('quota-floatingip')
113
101 for rid in relation_ids('neutron-api'):114 for rid in relation_ids('neutron-api'):
102 for unit in related_units(rid):115 for unit in related_units(rid):
103 rdata = relation_get(rid=rid, unit=unit)116 rdata = relation_get(rid=rid, unit=unit)
104117
=== modified file 'templates/icehouse/neutron.conf'
--- templates/icehouse/neutron.conf 2014-10-22 16:31:29 +0000
+++ templates/icehouse/neutron.conf 2015-02-24 11:28:29 +0000
@@ -50,7 +50,20 @@
50quota_driver = neutron.db.quota_db.DbQuotaDriver50quota_driver = neutron.db.quota_db.DbQuotaDriver
51{% if neutron_security_groups -%}51{% if neutron_security_groups -%}
52quota_items = network,subnet,port,security_group,security_group_rule52quota_items = network,subnet,port,security_group,security_group_rule
53quota_security_group = {{ quota_security_group }}
54quota_security_group_rule = {{ quota_security_group_rule }}
55{% else -%}
56quota_items = network,subnet,port
53{% endif -%}57{% endif -%}
58quota_network = {{ quota_network }}
59quota_subnet = {{ quota_subnet }}
60quota_port = {{ quota_port }}
61quota_vip = {{ quota_vip }}
62quota_pool = {{ quota_pool }}
63quota_member = {{ quota_member }}
64quota_health_monitors = {{ quota_health_monitors }}
65quota_router = {{ quota_router }}
66quota_floatingip = {{ quota_floatingip }}
5467
55[agent]68[agent]
56root_helper = sudo /usr/bin/neutron-rootwrap /etc/neutron/rootwrap.conf69root_helper = sudo /usr/bin/neutron-rootwrap /etc/neutron/rootwrap.conf
5770
=== modified file 'templates/kilo/neutron.conf'
--- templates/kilo/neutron.conf 2015-01-20 14:15:55 +0000
+++ templates/kilo/neutron.conf 2015-02-24 11:28:29 +0000
@@ -50,7 +50,20 @@
50quota_driver = neutron.db.quota_db.DbQuotaDriver50quota_driver = neutron.db.quota_db.DbQuotaDriver
51{% if neutron_security_groups -%}51{% if neutron_security_groups -%}
52quota_items = network,subnet,port,security_group,security_group_rule52quota_items = network,subnet,port,security_group,security_group_rule
53quota_security_group = {{ quota_security_group }}
54quota_security_group_rule = {{ quota_security_group_rule }}
55{% else -%}
56quota_items = network,subnet,port
53{% endif -%}57{% endif -%}
58quota_network = {{ quota_network }}
59quota_subnet = {{ quota_subnet }}
60quota_port = {{ quota_port }}
61quota_vip = {{ quota_vip }}
62quota_pool = {{ quota_pool }}
63quota_member = {{ quota_member }}
64quota_health_monitors = {{ quota_health_monitors }}
65quota_router = {{ quota_router }}
66quota_floatingip = {{ quota_floatingip }}
5467
55[agent]68[agent]
56root_helper = sudo /usr/bin/neutron-rootwrap /etc/neutron/rootwrap.conf69root_helper = sudo /usr/bin/neutron-rootwrap /etc/neutron/rootwrap.conf
5770
=== modified file 'unit_tests/test_neutron_api_context.py'
--- unit_tests/test_neutron_api_context.py 2015-01-13 14:43:04 +0000
+++ unit_tests/test_neutron_api_context.py 2015-02-24 11:28:29 +0000
@@ -157,6 +157,17 @@
157 'verbose': True,157 'verbose': True,
158 'l2_population': True,158 'l2_population': True,
159 'overlay_network_type': 'gre',159 'overlay_network_type': 'gre',
160 'quota_floatingip': 50,
161 'quota_health_monitors': -1,
162 'quota_member': -1,
163 'quota_network': 10,
164 'quota_pool': 10,
165 'quota_port': 50,
166 'quota_router': 10,
167 'quota_security_group': 10,
168 'quota_security_group_rule': 100,
169 'quota_subnet': 10,
170 'quota_vip': 10,
160 }171 }
161 napi_ctxt = context.NeutronCCContext()172 napi_ctxt = context.NeutronCCContext()
162 with patch.object(napi_ctxt, '_ensure_packages'):173 with patch.object(napi_ctxt, '_ensure_packages'):
@@ -175,6 +186,17 @@
175 'verbose': True,186 'verbose': True,
176 'l2_population': True,187 'l2_population': True,
177 'overlay_network_type': 'vxlan',188 'overlay_network_type': 'vxlan',
189 'quota_floatingip': 50,
190 'quota_health_monitors': -1,
191 'quota_member': -1,
192 'quota_network': 10,
193 'quota_pool': 10,
194 'quota_port': 50,
195 'quota_router': 10,
196 'quota_security_group': 10,
197 'quota_security_group_rule': 100,
198 'quota_subnet': 10,
199 'quota_vip': 10,
178 }200 }
179 napi_ctxt = context.NeutronCCContext()201 napi_ctxt = context.NeutronCCContext()
180 with patch.object(napi_ctxt, '_ensure_packages'):202 with patch.object(napi_ctxt, '_ensure_packages'):

Subscribers

People subscribed via source and target branches