Skip to content

Instantly share code, notes, and snippets.

View ramielrowe's full-sized avatar

Andrew Melton ramielrowe

View GitHub Profile
diff --git a/nova/virt/libvirt/driver.py b/nova/virt/libvirt/driver.py
index 39af093..a2586e9 100644
--- a/nova/virt/libvirt/driver.py
+++ b/nova/virt/libvirt/driver.py
@@ -976,10 +976,6 @@ class LibvirtDriver(driver.ComputeDriver):
old_domid = virt_dom.ID()
virt_dom.destroy()
- # NOTE(GuanQiang): teardown container to avoid resource leak
- if CONF.libvirt.virt_type == 'lxc':
lbaas
lbaas_agent_scheduler
l3_agent_scheduler
agent
quotas
dhcp_agent_scheduler
fwaas
vpnaas
router
allowed-address-pairs
setUpClass (tempest.api.network.admin.test_lbaas_agent_scheduler.LBaaSAgentSchedulerTestJSON)
setUpClass (tempest.api.network.admin.test_lbaas_agent_scheduler.LBaaSAgentSchedulerTestXML)
setUpClass (tempest.api.network.admin.test_load_balancer_admin_actions.LoadBalancerAdminTestJSON)
setUpClass (tempest.api.network.admin.test_load_balancer_admin_actions.LoadBalancerAdminTestXML)
tempest.api.network.admin.test_quotas.QuotasTest.test_lbaas_quotas[gate]
setUpClass (tempest.api.network.test_fwaas_extensions.FWaaSExtensionTestJSON)
setUpClass (tempest.api.network.test_fwaas_extensions.FWaaSExtensionTestXML)
setUpClass (tempest.api.network.test_load_balancer.LoadBalancerTestJSON)
setUpClass (tempest.api.network.test_load_balancer.LoadBalancerTestXML)
setUpClass (tempest.api.network.test_metering_extensions.MeteringJSON)
# Sample ``local.conf`` for user-configurable variables in ``stack.sh``
# NOTE: Copy this file to the root ``devstack`` directory for it to
# work properly.
# ``local.conf`` is a user-maintained setings file that is sourced from ``stackrc``.
# This gives it the ability to override any variables set in ``stackrc``.
# Also, most of the settings in ``stack.sh`` are written to only be set if no
# value has already been set; this lets ``local.conf`` effectively override the
# default values.
diff --git a/nova/virt/libvirt/driver.py b/nova/virt/libvirt/driver.py
index 39af093..a2586e9 100644
--- a/nova/virt/libvirt/driver.py
+++ b/nova/virt/libvirt/driver.py
@@ -976,10 +976,6 @@ class LibvirtDriver(driver.ComputeDriver):
old_domid = virt_dom.ID()
virt_dom.destroy()
- # NOTE(GuanQiang): teardown container to avoid resource leak
- if CONF.libvirt.virt_type == 'lxc':
2014-09-17 16:04:11.994 ERROR oslo.messaging.rpc.dispatcher [req-c3610fca-abea-428f-a5f1-37cfdc226055 demo demo] Exception during message handling: 'NoneType' object has no attribute '__getitem__'
2014-09-17 16:04:11.994 TRACE oslo.messaging.rpc.dispatcher Traceback (most recent call last):
2014-09-17 16:04:11.994 TRACE oslo.messaging.rpc.dispatcher File "/usr/local/lib/python2.7/dist-packages/oslo/messaging/rpc/dispatcher.py", line 134, in _dispatch_and_reply
2014-09-17 16:04:11.994 TRACE oslo.messaging.rpc.dispatcher incoming.message))
2014-09-17 16:04:11.994 TRACE oslo.messaging.rpc.dispatcher File "/usr/local/lib/python2.7/dist-packages/oslo/messaging/rpc/dispatcher.py", line 177, in _dispatch
2014-09-17 16:04:11.994 TRACE oslo.messaging.rpc.dispatcher return self._do_dispatch(endpoint, method, ctxt, args)
2014-09-17 16:04:11.994 TRACE oslo.messaging.rpc.dispatcher File "/usr/local/lib/python2.7/dist-packages/oslo/messaging/rpc/dispatcher.py", line 123, in _do_dispatch
2014-09-17 16:04:11.99
# Sample ``local.conf`` for user-configurable variables in ``stack.sh``
# NOTE: Copy this file to the root ``devstack`` directory for it to
# work properly.
# ``local.conf`` is a user-maintained setings file that is sourced from ``stackrc``.
# This gives it the ability to override any variables set in ``stackrc``.
# Also, most of the settings in ``stack.sh`` are written to only be set if no
# value has already been set; this lets ``local.conf`` effectively override the
# default values.
[[local|localrc]]
# Misc
ADMIN_PASSWORD=openstack
DATABASE_PASSWORD=$ADMIN_PASSWORD
ADMIN_PASSWORD=$ADMIN_PASSWORD
SERVICE_PASSWORD=$ADMIN_PASSWORD
SERVICE_TOKEN=$ADMIN_PASSWORD
RABBIT_PASSWORD=$ADMIN_PASSWORD
RECLONE=yes
[[local|localrc]]
ADMIN_PASSWORD=openstack
MYSQL_PASSWORD=$ADMIN_PASSWORD
RABBIT_PASSWORD=$ADMIN_PASSWORD
SERVICE_PASSWORD=$ADMIN_PASSWORD
SERVICE_TOKEN=$ADMIN_PASSWORD
LIBVIRT_TYPE=lxc
PUBLIC_INTERFACE=eth0
Inconsistent keys and data model
* Network attributes
** Create call
{“ExposedPorts”: {“22/tcp”: {}}}
** Inspect/show call
{“HostConfig”: {“PortBinding”: [{“22/tcp”: {“HostIP”: “0.0.0.0”, “HostPort”: “2222”}}]}}
** List call
{“Ports”: [{“PrivatePort”: “2222”, “PublicPort”: “22”, “Type”:”tcp”}]}
* Root level attributes in create call are then broken out into “Config”, “HostConfig” for show, but are also root level in list call.