Merge lp://qastaging/~corey.bryant/charms/trusty/keystone/git-ods into lp://qastaging/~openstack-charmers-archive/charms/trusty/keystone/next
Proposed by
Corey Bryant
Status: | Merged |
---|---|
Merged at revision: | 152 |
Proposed branch: | lp://qastaging/~corey.bryant/charms/trusty/keystone/git-ods |
Merge into: | lp://qastaging/~openstack-charmers-archive/charms/trusty/keystone/next |
Diff against target: |
444 lines (+152/-40) 7 files modified
hooks/charmhelpers/contrib/openstack/utils.py (+65/-18) hooks/charmhelpers/contrib/python/packages.py (+28/-5) hooks/charmhelpers/fetch/giturl.py (+7/-5) hooks/keystone_utils.py (+32/-3) tests/basic_deployment.py (+2/-2) unit_tests/test_keystone_hooks.py (+5/-4) unit_tests/test_keystone_utils.py (+13/-3) |
To merge this branch: | bzr merge lp://qastaging/~corey.bryant/charms/trusty/keystone/git-ods |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
OpenStack Charmers | Pending | ||
Review via email:
|
Commit message
Adds support to:
* Use a Python virtualenv when deploying from source
* Default to shallow clone for git (depth=1)
* Pass http_proxy to pip installs if specified
To post a comment you must log in.
charm_lint_check #3821 keystone-next for corey.bryant mp257188
LINT OK: passed
Build: http:// 10.245. 162.77: 8080/job/ charm_lint_ check/3821/