openstack/charm-nova-compute
Code Issues Proposed changes

removed phy-nic* options since handled by ovs plugin charm

Browse Source
This commit is contained in:
Edward Hope-Morley 2015-03-12 10:07:02 +00:00
parent 04eefa8a54
commit 7d370dbc25
3 changed files with 0 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
config.yaml
View File

@ -160,18 +160,6 @@ options:
order for this charm to function correctly, the privacy extension must be order for this charm to function correctly, the privacy extension must be
disabled and a non-temporary address must be configured/available on disabled and a non-temporary address must be configured/available on
your network interface. your network interface.
phy-nics:
type: string
default:
description: |
A space-separated list of net devices that we want phy-nic-mtu applied to.
phy-nic-mtu:
type: int
default:
description: |
To improve network performance of VM, sometimes we should keep VM MTU as
1500 and use charm to modify MTU of tunnel nic more than 1500 (e.g. 1546
for GRE).
network-device-mtu: network-device-mtu:
type: int type: int
default: default:

14
hooks/nova_compute_context.py
View File

@ -446,17 +446,3 @@ class HostIPContext(context.OSContextGenerator):
ctxt['host_ip'] = format_ipv6_addr(host_ip) or host_ip ctxt['host_ip'] = format_ipv6_addr(host_ip) or host_ip
return ctxt return ctxt
class PhyNICMTUContext(context.NeutronPortContext):
def __call__(self):
ctxt = {}
port = config('phy-nics')
if port:
ctxt = {"devs": port.replace(' ', '\\n')}
mtu = config('phy-nic-mtu')
if mtu:
ctxt['mtu'] = mtu
return ctxt

10
hooks/nova_compute_utils.py
View File

@ -46,12 +46,10 @@ from nova_compute_context import (
CEPH_CONF, CEPH_CONF,
ceph_config_file, ceph_config_file,
HostIPContext, HostIPContext,
PhyNICMTUContext,
) )
CA_CERT_PATH = '/usr/local/share/ca-certificates/keystone_juju_ca_cert.crt' CA_CERT_PATH = '/usr/local/share/ca-certificates/keystone_juju_ca_cert.crt'
PHY_NIC_MTU_CONF = '/etc/init/os-charm-phy-nic-mtu.conf'
TEMPLATES = 'templates/' TEMPLATES = 'templates/'
BASE_PACKAGES = [ BASE_PACKAGES = [
@ -119,10 +117,6 @@ QUANTUM_RESOURCES = {
context.AMQPContext(ssl_dir=QUANTUM_CONF_DIR), context.AMQPContext(ssl_dir=QUANTUM_CONF_DIR),
context.SyslogContext()], context.SyslogContext()],
}, },
PHY_NIC_MTU_CONF: {
'services': ['os-charm-phy-nic-mtu'],
'contexts': [PhyNICMTUContext()],
}
} }
NEUTRON_CONF_DIR = "/etc/neutron" NEUTRON_CONF_DIR = "/etc/neutron"
@ -135,10 +129,6 @@ NEUTRON_RESOURCES = {
context.AMQPContext(ssl_dir=NEUTRON_CONF_DIR), context.AMQPContext(ssl_dir=NEUTRON_CONF_DIR),
context.SyslogContext()], context.SyslogContext()],
}, },
PHY_NIC_MTU_CONF: {
'services': ['os-charm-phy-nic-mtu'],
'contexts': [PhyNICMTUContext()],
}
} }