lp:~corey.bryant/charms/trusty/neutron-openvswitch/git

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:~openstack-charmers-archive/charms/trusty/neutron-openvswitch/next at revision 59

Ryan Beisner (community): Needs Fixing on 2015-04-07

OpenStack Charmers: Pending requested 2015-04-02

Diff: 1087 lines (+702/-53) (has conflicts)

24 files modified

.bzrignore (+1/-0)
Makefile (+4/-3)
README.md (+87/-0)
actions.yaml (+2/-0)
actions/git_reinstall.py (+45/-0)
charm-helpers-hooks.yaml (+12/-0)
charm-helpers-sync.yaml (+0/-12)
config.yaml (+17/-0)
hooks/charmhelpers/contrib/openstack/utils.py (+18/-6)
hooks/neutron_ovs_hooks.py (+13/-0)
hooks/neutron_ovs_utils.py (+123/-2)
templates/git/neutron_sudoers (+4/-0)
templates/git/upstart/neutron-ovs-cleanup.upstart (+17/-0)
templates/git/upstart/neutron-plugin-openvswitch-agent.upstart (+18/-0)
tests/16-basic-trusty-icehouse-git (+9/-0)
tests/16-basic-trusty-juno (+0/-11)
tests/17-basic-trusty-juno (+11/-0)
tests/18-basic-trusty-juno-git (+12/-0)
tests/basic_deployment.py (+28/-5)
unit_tests/__init__.py (+2/-0)
unit_tests/test_actions_git_reinstall.py (+105/-0)
unit_tests/test_neutron_ovs_context.py (+1/-1)
unit_tests/test_neutron_ovs_hooks.py (+71/-12)
unit_tests/test_neutron_ovs_utils.py (+102/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

61. By Corey Bryant on 2015-04-16

Sync charm-helpers

60. By Corey Bryant on 2015-04-15

Move config_changed into try block

59. By Corey Bryant on 2015-04-15

Sync charm-helpers

58. By Corey Bryant on 2015-04-15

Merge next branch

57. By Corey Bryant on 2015-04-15

Fixup test_git_reinstall_exception()

56. By Corey Bryant on 2015-04-14

Run config-changed hook after git-reinstall action installs from source

55. By Corey Bryant on 2015-04-13

Turn DEBUG on by default for amulet tests

54. By Corey Bryant on 2015-04-13

Bulk copy files to /etc/neutron

53. By Corey Bryant on 2015-04-13

Move deploy from source template files to templates/git

52. By Corey Bryant on 2015-04-13

Get http_proxy from AMULET_HTTP_PROXY env var