lp:~1chb1n/charms/trusty/glance/next-amulet-debug-and-makefile
Created by
Ryan Beisner
and last modified
- Get this branch:
- bzr branch lp:~1chb1n/charms/trusty/glance/next-amulet-debug-and-makefile
Only
Ryan Beisner
can upload to this branch. If you are
Ryan Beisner
please log in for upload directions.
Branch merges
Propose for merging
No branches
dependent on this one.
- OpenStack Charmers: Pending requested
-
Diff: 82 lines (+35/-4)5 files modifiedMakefile (+1/-4)
hooks/charmhelpers/contrib/openstack/context.py (+5/-0)
tests/017-basic-trusty-kilo (+11/-0)
tests/018-basic-utopic-juno (+9/-0)
tests/019-basic-vivid-kilo (+9/-0)
Superseded
for merging
into
lp:~openstack-charmers-archive/charms/trusty/glance/trunk
- OpenStack Charmers: Pending requested
-
Diff: 4234 lines (+2604/-318)57 files modified.bzrignore (+1/-0)
Makefile (+2/-3)
README.md (+82/-0)
actions.yaml (+2/-0)
actions/git_reinstall.py (+45/-0)
config.yaml (+22/-0)
hooks/charmhelpers/contrib/charmsupport/nrpe.py (+41/-7)
hooks/charmhelpers/contrib/hahelpers/cluster.py (+5/-1)
hooks/charmhelpers/contrib/network/ip.py (+84/-1)
hooks/charmhelpers/contrib/openstack/amulet/deployment.py (+34/-5)
hooks/charmhelpers/contrib/openstack/context.py (+280/-13)
hooks/charmhelpers/contrib/openstack/files/__init__.py (+18/-0)
hooks/charmhelpers/contrib/openstack/files/check_haproxy.sh (+32/-0)
hooks/charmhelpers/contrib/openstack/files/check_haproxy_queue_depth.sh (+30/-0)
hooks/charmhelpers/contrib/openstack/ip.py (+37/-0)
hooks/charmhelpers/contrib/openstack/neutron.py (+83/-0)
hooks/charmhelpers/contrib/openstack/templates/git.upstart (+17/-0)
hooks/charmhelpers/contrib/openstack/templates/section-keystone-authtoken (+9/-0)
hooks/charmhelpers/contrib/openstack/templates/section-rabbitmq-oslo (+22/-0)
hooks/charmhelpers/contrib/openstack/templates/section-zeromq (+14/-0)
hooks/charmhelpers/contrib/openstack/utils.py (+142/-141)
hooks/charmhelpers/contrib/python/packages.py (+2/-2)
hooks/charmhelpers/core/fstab.py (+4/-4)
hooks/charmhelpers/core/hookenv.py (+40/-1)
hooks/charmhelpers/core/host.py (+10/-6)
hooks/charmhelpers/core/services/helpers.py (+12/-4)
hooks/charmhelpers/core/strutils.py (+42/-0)
hooks/charmhelpers/core/sysctl.py (+2/-2)
hooks/charmhelpers/core/templating.py (+3/-3)
hooks/charmhelpers/core/unitdata.py (+477/-0)
hooks/charmhelpers/fetch/archiveurl.py (+10/-10)
hooks/charmhelpers/fetch/giturl.py (+1/-1)
hooks/glance_relations.py (+43/-17)
hooks/glance_utils.py (+139/-9)
templates/kilo/glance-api-paste.ini (+77/-0)
templates/kilo/glance-api.conf (+83/-0)
templates/kilo/glance-registry-paste.ini (+30/-0)
templates/kilo/glance-registry.conf (+27/-0)
templates/parts/keystone (+1/-0)
templates/parts/section-database (+1/-0)
tests/016-basic-trusty-juno (+11/-0)
tests/017-basic-trusty-kilo (+11/-0)
tests/018-basic-utopic-juno (+9/-0)
tests/019-basic-vivid-kilo (+9/-0)
tests/050-basic-trusty-icehouse-git (+9/-0)
tests/051-basic-trusty-juno-git (+12/-0)
tests/10-basic-precise-essex (+0/-9)
tests/11-basic-precise-folsom (+0/-11)
tests/12-basic-precise-grizzly (+0/-11)
tests/13-basic-precise-havana (+0/-11)
tests/basic_deployment.py (+27/-4)
tests/charmhelpers/contrib/amulet/utils.py (+125/-3)
tests/charmhelpers/contrib/openstack/amulet/deployment.py (+34/-5)
unit_tests/__init__.py (+1/-0)
unit_tests/test_actions_git_reinstall.py (+96/-0)
unit_tests/test_glance_relations.py (+113/-26)
unit_tests/test_glance_utils.py (+141/-8)
Branch information
- Owner:
- Ryan Beisner
- Status:
- Merged
Recent revisions
- 110. By Ryan Beisner
-
auto Makefile test target (amulet): bump juju test timeout to 2700s (same value as the juju-deployer default). Also remove explicit test names, which will cause all +x files in ./tests to be executed (as bundletester does by default).
- 105. By Edward Hope-Morley
-
[hopem,
r=wolsen, gnuoy] Ensure apache2 reloaded/restarted when https configured
Closes-Bug: #1410568
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)