Merge lp://qastaging/~corey.bryant/charms/trusty/quantum-gateway/end-of-life into lp://qastaging/~openstack-charmers/charms/trusty/quantum-gateway/next
Proposed by
Corey Bryant
| Status: | Merged |
|---|---|
| Merged at revision: | 114 |
| Proposed branch: | lp://qastaging/~corey.bryant/charms/trusty/quantum-gateway/end-of-life |
| Merge into: | lp://qastaging/~openstack-charmers/charms/trusty/quantum-gateway/next |
| Diff against target: |
15436 lines (+344/-14080) 138 files modified
.bzrignore (+0/-1) .coveragerc (+0/-6) .project (+0/-17) .pydevproject (+0/-9) Makefile (+1/-13) README.md (+1/-207) actions.yaml (+0/-2) actions/git_reinstall.py (+0/-45) charm-helpers-hooks.yaml (+0/-9) charm-helpers-tests.yaml (+0/-5) files/NeutronAgentMon (+0/-155) files/neutron-ha-monitor.conf (+0/-4) files/neutron-ha-monitor.py (+0/-436) hooks/charmhelpers/contrib/__init__.py (+0/-15) hooks/charmhelpers/contrib/charmsupport/__init__.py (+0/-15) hooks/charmhelpers/contrib/charmsupport/nrpe.py (+0/-360) hooks/charmhelpers/contrib/charmsupport/volumes.py (+0/-175) hooks/charmhelpers/contrib/hahelpers/__init__.py (+0/-15) hooks/charmhelpers/contrib/hahelpers/apache.py (+0/-82) hooks/charmhelpers/contrib/hahelpers/cluster.py (+0/-272) hooks/charmhelpers/contrib/network/__init__.py (+0/-15) hooks/charmhelpers/contrib/network/ip.py (+0/-450) hooks/charmhelpers/contrib/network/ovs/__init__.py (+0/-96) hooks/charmhelpers/contrib/network/ufw.py (+0/-276) hooks/charmhelpers/contrib/openstack/__init__.py (+0/-15) hooks/charmhelpers/contrib/openstack/alternatives.py (+0/-33) hooks/charmhelpers/contrib/openstack/amulet/__init__.py (+0/-15) hooks/charmhelpers/contrib/openstack/amulet/deployment.py (+0/-146) hooks/charmhelpers/contrib/openstack/amulet/utils.py (+0/-294) hooks/charmhelpers/contrib/openstack/context.py (+0/-1328) hooks/charmhelpers/contrib/openstack/files/__init__.py (+0/-18) hooks/charmhelpers/contrib/openstack/files/check_haproxy.sh (+0/-32) hooks/charmhelpers/contrib/openstack/files/check_haproxy_queue_depth.sh (+0/-30) hooks/charmhelpers/contrib/openstack/ip.py (+0/-146) hooks/charmhelpers/contrib/openstack/neutron.py (+0/-322) hooks/charmhelpers/contrib/openstack/templates/__init__.py (+0/-18) hooks/charmhelpers/contrib/openstack/templates/ceph.conf (+0/-15) hooks/charmhelpers/contrib/openstack/templates/git.upstart (+0/-17) hooks/charmhelpers/contrib/openstack/templates/haproxy.cfg (+0/-58) hooks/charmhelpers/contrib/openstack/templates/openstack_https_frontend (+0/-24) hooks/charmhelpers/contrib/openstack/templates/openstack_https_frontend.conf (+0/-24) hooks/charmhelpers/contrib/openstack/templates/section-keystone-authtoken (+0/-9) hooks/charmhelpers/contrib/openstack/templates/section-rabbitmq-oslo (+0/-22) hooks/charmhelpers/contrib/openstack/templates/section-zeromq (+0/-14) hooks/charmhelpers/contrib/openstack/templating.py (+0/-295) hooks/charmhelpers/contrib/openstack/utils.py (+0/-642) hooks/charmhelpers/contrib/python/__init__.py (+0/-15) hooks/charmhelpers/contrib/python/debug.py (+0/-56) hooks/charmhelpers/contrib/python/packages.py (+0/-96) hooks/charmhelpers/contrib/python/rpdb.py (+0/-58) hooks/charmhelpers/contrib/python/version.py (+0/-34) hooks/charmhelpers/contrib/storage/__init__.py (+0/-15) hooks/charmhelpers/contrib/storage/linux/__init__.py (+0/-15) hooks/charmhelpers/contrib/storage/linux/ceph.py (+0/-444) hooks/charmhelpers/contrib/storage/linux/loopback.py (+0/-78) hooks/charmhelpers/contrib/storage/linux/lvm.py (+0/-105) hooks/charmhelpers/contrib/storage/linux/utils.py (+0/-70) hooks/charmhelpers/core/hookenv.py (+232/-38) hooks/charmhelpers/core/host.py (+56/-12) hooks/charmhelpers/core/services/base.py (+43/-19) hooks/charmhelpers/core/services/helpers.py (+2/-2) hooks/charmhelpers/fetch/__init__.py (+0/-439) hooks/charmhelpers/fetch/archiveurl.py (+0/-161) hooks/charmhelpers/fetch/bzrurl.py (+0/-78) hooks/charmhelpers/fetch/giturl.py (+0/-71) hooks/charmhelpers/payload/__init__.py (+0/-17) hooks/charmhelpers/payload/execd.py (+0/-66) hooks/quantum_contexts.py (+0/-193) hooks/quantum_hooks.py (+7/-327) hooks/quantum_utils.py (+0/-1153) metadata.yaml (+2/-0) setup.cfg (+0/-5) templates/ext-port.conf (+0/-16) templates/folsom/dhcp_agent.ini (+0/-10) templates/folsom/l3_agent.ini (+0/-8) templates/folsom/metadata_agent.ini (+0/-12) templates/folsom/nova.conf (+0/-26) templates/folsom/ovs_quantum_plugin.ini (+0/-8) templates/folsom/quantum.conf (+0/-15) templates/git/cron.d/neutron-dhcp-agent-netns-cleanup (+0/-4) templates/git/cron.d/neutron-l3-agent-netns-cleanup (+0/-4) templates/git/cron.d/neutron-lbaas-agent-netns-cleanup (+0/-4) templates/git/neutron_sudoers (+0/-4) templates/git/upstart/neutron-agent.upstart (+0/-25) templates/git/upstart/neutron-ovs-cleanup.upstart (+0/-13) templates/git/upstart/neutron-server.upstart (+0/-22) templates/grizzly/nova.conf (+0/-22) templates/grizzly/quantum.conf (+0/-11) templates/havana/dhcp_agent.ini (+0/-27) templates/havana/dnsmasq.conf (+0/-3) templates/havana/fwaas_driver.ini (+0/-7) templates/havana/l3_agent.ini (+0/-24) templates/havana/lbaas_agent.ini (+0/-8) templates/havana/metadata_agent.ini (+0/-18) templates/havana/metering_agent.ini (+0/-10) templates/havana/neutron.conf (+0/-16) templates/havana/nova.conf (+0/-27) templates/havana/ovs_neutron_plugin.ini (+0/-14) templates/havana/vpn_agent.ini (+0/-8) templates/icehouse/metadata_agent.ini (+0/-19) templates/icehouse/ml2_conf.ini (+0/-35) templates/icehouse/neutron.conf (+0/-18) templates/juno/l3_agent.ini (+0/-25) templates/juno/ml2_conf.ini (+0/-36) templates/kilo/fwaas_driver.ini (+0/-8) templates/kilo/lbaas_agent.ini (+0/-13) templates/kilo/neutron.conf (+0/-25) templates/kilo/nova.conf (+0/-33) templates/kilo/vpn_agent.ini (+0/-9) templates/os-charm-phy-nic-mtu.conf (+0/-22) templates/parts/database (+0/-1) templates/parts/rabbitmq (+0/-21) tests/00-setup (+0/-11) tests/014-basic-precise-icehouse (+0/-11) tests/015-basic-trusty-icehouse (+0/-9) tests/016-basic-trusty-juno (+0/-11) tests/017-basic-trusty-kilo (+0/-11) tests/018-basic-utopic-juno (+0/-9) tests/019-basic-vivid-kilo (+0/-9) tests/050-basic-trusty-icehouse-git (+0/-9) tests/051-basic-trusty-juno-git (+0/-12) tests/README (+0/-53) tests/basic_deployment.py (+0/-656) tests/charmhelpers/__init__.py (+0/-38) tests/charmhelpers/contrib/__init__.py (+0/-15) tests/charmhelpers/contrib/amulet/__init__.py (+0/-15) tests/charmhelpers/contrib/amulet/deployment.py (+0/-93) tests/charmhelpers/contrib/amulet/utils.py (+0/-323) tests/charmhelpers/contrib/openstack/__init__.py (+0/-15) tests/charmhelpers/contrib/openstack/amulet/__init__.py (+0/-15) tests/charmhelpers/contrib/openstack/amulet/deployment.py (+0/-146) tests/charmhelpers/contrib/openstack/amulet/utils.py (+0/-294) unit_tests/__init__.py (+0/-4) unit_tests/test_actions_git_reinstall.py (+0/-105) unit_tests/test_quantum_contexts.py (+0/-274) unit_tests/test_quantum_hooks.py (+0/-370) unit_tests/test_quantum_utils.py (+0/-1077) unit_tests/test_utils.py (+0/-100) |
| To merge this branch: | bzr merge lp://qastaging/~corey.bryant/charms/trusty/quantum-gateway/end-of-life |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| James Page | Approve | ||
|
Review via email:
|
|||
To post a comment you must log in.
Revision history for this message
| Corey Bryant (corey.bryant) wrote | # |
Revision history for this message
| Corey Bryant (corey.bryant) wrote | # |
Revision history for this message
| Corey Bryant (corey.bryant) wrote | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
We need to let users know they shouldn't use the quantum-gateway charm. This patch uses status-set to let users know it's EOL and they should use the neutron-gateway charm instead.
The two options I debated were:
1) sys.exit(1) in install hook (doesn't allow you to set a status message; could set log message but user has to look in log)
2) set status to 'blocked' with corresponding message* (doesn't fail the deployment but displays a clear message to 'juju status')
* status-set can only set the state to 'maintenance', 'blocked', 'waiting', or 'active'.
I went with option 2 in this patch, so deployment will look successful and 'juju status' will show the following:
'status-get'
valid_states = ['maintenance', 'blocked', 'waiting', 'active']
neutron-gateway:
charm: local:trusty/
exposed: false
service-status:
current: blocked
message: Charm has reached end-of-life. Please use neutron-gateway charm.
since: 16 Jul 2015 18:11:14Z
relations:
amqp:
- rabbitmq-server
cluster:
- neutron-gateway
neutron-
- neutron-api
quantum-
- nova-cloud-
shared-db:
- mysql
units:
neutron-
current: blocked
message: Charm has reached end-of-life. Please use neutron-gateway charm.
since: 16 Jul 2015 18:11:14Z
current: idle
since: 16 Jul 2015 18:17:59Z
version: 1.24.2
machine: "12"