Merge lp://qastaging/~springfield-team/charms/trusty/nova-cloud-controller/n1kv into lp://qastaging/~openstack-charmers-archive/charms/trusty/nova-cloud-controller/next
Proposed by
Shiv Prasad Rao
Status: | Superseded |
---|---|
Proposed branch: | lp://qastaging/~springfield-team/charms/trusty/nova-cloud-controller/n1kv |
Merge into: | lp://qastaging/~openstack-charmers-archive/charms/trusty/nova-cloud-controller/next |
Diff against target: |
1976 lines (+597/-368) 13 files modified
hooks/charmhelpers/contrib/network/ip.py (+50/-48) hooks/charmhelpers/contrib/openstack/context.py (+303/-215) hooks/charmhelpers/contrib/openstack/neutron.py (+18/-2) hooks/charmhelpers/contrib/openstack/utils.py (+24/-0) hooks/charmhelpers/contrib/storage/linux/ceph.py (+81/-97) hooks/charmhelpers/core/hookenv.py (+6/-0) hooks/charmhelpers/core/host.py (+8/-2) hooks/charmhelpers/core/services/__init__.py (+2/-2) hooks/charmhelpers/fetch/__init__.py (+5/-1) hooks/charmhelpers/fetch/giturl.py (+44/-0) templates/icehouse/cisco_plugins.ini (+43/-0) templates/icehouse/nova.conf (+12/-0) tests/basic_deployment.py (+1/-1) |
To merge this branch: | bzr merge lp://qastaging/~springfield-team/charms/trusty/nova-cloud-controller/n1kv |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Edward Hope-Morley | Pending | ||
Review via email: mp+242447@code.qastaging.launchpad.net |
This proposal supersedes a proposal from 2014-11-20.
To post a comment you must log in.
Unmerged revisions
- 130. By Edward Hope-Morley
-
[hopem] synced /next
- 129. By Shiv Prasad Rao
-
Changes for n1kv
- 128. By Jorge Niedbalski
-
[all] resync with /next && charm helpers "make sync"
- 127. By Shiv Prasad Rao
-
Additional changes for n1kv
- 126. By Shiv Prasad Rao
-
Cisco Nexus 1000V changes
UOSCI bot says: controller- next for shivrao mp242447
charm_lint_check #1166 nova-cloud-
LINT OK: passed
LINT Results (max last 5 lines): client- timeout has no default value
I: config.yaml: option os-admin-network has no default value
I: config.yaml: option haproxy-
I: config.yaml: option ssl_cert has no default value
I: config.yaml: option nvp-l3-uuid has no default value
I: config.yaml: option os-internal-network has no default value
Full lint test output: http:// paste.ubuntu. com/9137369/ 10.98.191. 181:8080/ job/charm_ lint_check/ 1166/
Build: http://