165 Commits

Author SHA1 Message Date
Subbarayudu Mukkamala
7c482421d6 Fix unit-test errors and code-cleanup 2015-04-12 13:34:46 -07:00
Subbarayudu Mukkamala
2ab51d4272 Merge from lp:~openstack-charmers/.../next 2015-04-09 19:35:50 -07:00
Subbarayudu Mukkamala
df550b9782 Add nuage vsp unit tests 2015-04-09 10:23:02 -07:00
James Page
7524f7a9c8 Rebase 2015-04-01 15:20:32 +01:00
Liam Young
33303b66cf Pass over auth_protocol 2015-04-01 12:26:15 +01:00
Liam Young
37c33b8239 IdentityServiceContext sometime returns none 2015-03-31 15:20:42 +00:00
Liam Young
d4bca84a9f If identity info changes update neutron plugin api clients 2015-03-31 14:54:53 +00:00
James Page
7b27f8305a Rebase 2015-03-31 15:54:38 +01:00
Liam Young
724bf8a25a Fix unit_tests 2015-03-31 14:52:11 +00:00
Liam Young
be4e2eb8cf [gnuoy, trivial] Backout last commit which was pushed in error 2015-03-31 14:40:59 +00:00
Liam Young
40e6e3e94a Pass on keystone relation data to neutron services 2015-03-31 14:38:51 +00:00
Edward Hope-Morley
83905b1852 [hopem,r=wolsen,gnuoy]
Ensure apache2 reloaded/restarted when https configured

Closes-Bug: #1410568
2015-03-31 09:37:29 +01:00
Edward Hope-Morley
a7855d8fe1 use service_reload() 2015-03-30 18:26:30 +01:00
James Page
30f01ba5b1 Rebase resync 2015-03-30 16:59:24 +01:00
Edward Hope-Morley
cfead311f3 [hopem,r=]
Ensure apache2 reloaded/restarted when https configured

Closes-Bug: #1410568
2015-03-29 21:09:15 +01:00
Liam Young
edbf76c678 Error on disabling l3ha when l3ha routers are present. 2015-03-27 10:59:50 +00:00
Liam Young
e15de93835 Merged next in 2015-03-23 13:17:46 +00:00
Edward Hope-Morley
b5eb09268a synced /next 2015-03-16 21:59:12 +00:00
James Page
d25c411e27 Tidy lint 2015-03-16 16:23:36 +00:00
James Page
6eca206fa2 Make 0mq support >= kilo 2015-03-16 16:11:37 +00:00
James Page
9cc33dd54e Rebase 2015-03-16 14:16:02 +00:00
Subbarayudu Mukkamala
9943d194b2 Merge from upstream from: ~openstack-charmers 2015-03-13 14:23:55 -07:00
Liam Young
613ae8475c Error if dvr resources are present but dvr is off 2015-03-03 11:07:21 +00:00
Subbarayudu Mukkamala
54ca4fe0c8 Bug 1425279: There needs to be a private key parameter 2015-02-25 21:07:21 -08:00
Brad Marshall
12a3289c2f [bradm] Fixed merge conflicts 2015-02-26 14:21:30 +10:00
James Page
263b94d7d8 Ensure check uses a neutron package for zeromq support 2015-02-24 11:44:11 +00:00
James Page
25a2fd7909 Rebase 2015-02-24 11:40:25 +00:00
Edward Hope-Morley
f810d0321b synced /next 2015-02-24 11:33:10 +00:00
Liam Young
152d835a5d Add vrrp ha support 2015-02-20 11:50:14 +00:00
Liam Young
91bbe12bf0 Merged next in and fixed unit tests 2015-02-19 13:04:17 +00:00
Brad Marshall
6acd55cd2b [bradm] Add haproxy nrpe checks 2015-02-19 14:21:44 +10:00
Liam Young
de2ae2bfa8 Fix lint and unit tests after previous commit 2015-02-13 15:04:48 +00:00
Liam Young
2afc08d082 [jasper-aikema, r=gnuoy] Fix postgres relation 2015-02-13 15:03:48 +00:00
Liam Young
ecb9db4af3 Fix lint and unit tests after previous commit 2015-02-13 15:02:52 +00:00
Liam Young
5970419451 [jasper-aikema, r=gnuoy] Fix postgres relation 2015-02-13 15:00:25 +00:00
Subbarayudu Mukkamala
a831f905cd Fix Lint errors 2015-02-12 19:42:14 -08:00
Subbarayudu Mukkamala
cf5e57f3b3 Fix Lint errors 2015-02-12 19:13:11 -08:00
Subbarayudu Mukkamala
72d94c7b8f Fix Lint errors 2015-02-12 18:59:17 -08:00
Subbarayudu Mukkamala
e7dc1541f6 Fix Lint errors 2015-02-12 17:48:13 -08:00
Subbarayudu Mukkamala
3f66c051d0 Fix Lint errors 2015-02-12 10:31:57 -08:00
Subbarayudu Mukkamala
6eb96b43ce Fix Lint errors 2015-02-11 20:35:21 -08:00
Edward Hope-Morley
54859b8a7d more 2015-02-11 13:39:13 +00:00
Edward Hope-Morley
c76a60ea32 default to no network-device-mtu 2015-02-10 09:52:15 +00:00
Subbarayudu Mukkamala
c0d7094a27 Merge from lp:~openstack-charmers 2015-02-03 08:54:59 -08:00
Edward Hope-Morley
b7ca22038b [zhhuabj,hopem,r=]
Enable network-device-mtu
2015-02-03 11:21:37 +00:00
James Page
94328c6655 tidy lint 2015-02-03 07:33:30 +02:00
Liam Young
f18c0cc0f8 Add dvr support 2015-02-02 13:29:41 +00:00
James Page
392f420eca Add kilo support 2015-01-20 14:15:55 +00:00
James Page
fd081377cf Rebase on next 2015-01-13 14:43:04 +00:00
James Page
7d63f9bdb2 Rebase on next 2015-01-13 09:19:48 +00:00