lp:~corey.bryant/charms/trusty/quantum-gateway/git

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:~openstack-charmers/charms/trusty/quantum-gateway/next at revision 100

James Page: Needs Fixing on 2015-04-13

Diff: 1787 lines (+1333/-58) (has conflicts)

26 files modified

.bzrignore (+1/-0)
Makefile (+4/-2)
README.md (+88/-0)
actions.yaml (+2/-0)
actions/git_reinstall.py (+45/-0)
config.yaml (+16/-0)
hooks/charmhelpers/contrib/openstack/utils.py (+18/-6)
hooks/quantum_hooks.py (+18/-6)
hooks/quantum_utils.py (+398/-7)
templates/git/cron.d/neutron-dhcp-agent-netns-cleanup (+4/-0)
templates/git/cron.d/neutron-l3-agent-netns-cleanup (+4/-0)
templates/git/cron.d/neutron-lbaas-agent-netns-cleanup (+4/-0)
templates/git/neutron_sudoers (+4/-0)
templates/git/upstart/neutron-agent.upstart (+25/-0)
templates/git/upstart/neutron-ovs-cleanup.upstart (+13/-0)
templates/git/upstart/neutron-server.upstart (+22/-0)
tests/12-basic-precise-grizzly (+0/-11)
tests/13-basic-precise-havana (+0/-11)
tests/16-basic-trusty-icehouse-git (+9/-0)
tests/17-basic-trusty-juno (+11/-0)
tests/18-basic-trusty-juno-git (+12/-0)
tests/basic_deployment.py (+27/-4)
unit_tests/__init__.py (+2/-0)
unit_tests/test_actions_git_reinstall.py (+105/-0)
unit_tests/test_quantum_hooks.py (+91/-4)
unit_tests/test_quantum_utils.py (+410/-7)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

106. By Corey Bryant on 2015-04-16

Sync charm-helpers

105. By Corey Bryant on 2015-04-15

Move config_changed into try block

104. By Corey Bryant on 2015-04-15

Sync charm-helpers

103. By Corey Bryant on 2015-04-15

Merge next branch

102. By Corey Bryant on 2015-04-15

Fixup test_git_reinstall_exception()

101. By Corey Bryant on 2015-04-14

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

100. By Corey Bryant on 2015-04-14

Defer starting of services to config-changed when deploying from source

99. By Corey Bryant on 2015-04-13

Bulk copy files to /etc/neutron

98. By Corey Bryant on 2015-04-13

Move deploy from source template files to templates/git

97. By Corey Bryant on 2015-04-13

Get http_proxy from AMULET_HTTP_PROXY env var