x
/
charm-neutron-api-plumgrid
Code Issues Proposed changes

mitaka changes

This commit is contained in:
Junaid Ali 2016-05-14 13:23:56 +02:00
parent 21f96b3aba
commit 1854d5f8f7
4 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
config.yaml
View File

@ -39,3 +39,8 @@ options:
description: | description: |
If True neutron-api charm will install neutron packages for the plugin If True neutron-api charm will install neutron packages for the plugin
configured. Also needs to be set in neutron-api charm configured. Also needs to be set in neutron-api charm
connector-type:
type: string
default: distributed
description: |
Tunnel learning

1
hooks/neutron_plumgrid_context.py
View File

@ -117,6 +117,7 @@ class NeutronPGPluginContext(context.NeutronContext):
pg_ctxt['pg_metadata_subnet'] = '169.254.169.254/30' pg_ctxt['pg_metadata_subnet'] = '169.254.169.254/30'
pg_ctxt['pg_metadata_port'] = '8775' pg_ctxt['pg_metadata_port'] = '8775'
pg_ctxt['metadata_mode'] = 'tunnel' pg_ctxt['metadata_mode'] = 'tunnel'
pg_ctxt['connector_type'] = config('connector-type')
if enable_metadata: if enable_metadata:
plumgrid_edge_ctxt = _edge_context() plumgrid_edge_ctxt = _edge_context()
pg_ctxt['nova_metadata_proxy_secret'] = \ pg_ctxt['nova_metadata_proxy_secret'] = \

14
hooks/neutron_plumgrid_utils.py
View File

@ -12,6 +12,7 @@ import neutron_plumgrid_context
from charmhelpers.contrib.openstack import templating from charmhelpers.contrib.openstack import templating
from charmhelpers.contrib.openstack.neutron import neutron_plugin_attribute from charmhelpers.contrib.openstack.neutron import neutron_plugin_attribute
from charmhelpers.contrib.python.packages import pip_install from charmhelpers.contrib.python.packages import pip_install
from charmhelpers.contrib.python.packages import apt_install
from charmhelpers.fetch import ( from charmhelpers.fetch import (
apt_cache apt_cache
) )
@ -156,12 +157,17 @@ def install_networking_plumgrid():
''' '''
release = os_release('neutron-common', base='kilo') release = os_release('neutron-common', base='kilo')
if config('networking-plumgrid-version') is None: if config('networking-plumgrid-version') is None:
package_version = NETWORKING_PLUMGRID_VERSION[release] #error point..."KeyError: 'mitaka'"...no net_pg_version for mitaka
#package_version = NETWORKING_PLUMGRID_VERSION[release]
print "######### install_networking_pg()"
else: else:
package_version = config('networking-plumgrid-version') package_version = config('networking-plumgrid-version')
package_name = 'networking-plumgrid==%s' % package_version #package_name = 'networking-plumgrid==%s' % package_version
pip_install(package_name, fatal=True) #pip_install(package_name, fatal=True)
if is_leader() and package_version != '2015.1.1.1': apt_install("git")
pip_install("git+https://github.com/openstack/networking-plumgrid.git", fatal=True)
if is_leader():
# and package_version != '2015.1.1.1':
migrate_neutron_db() migrate_neutron_db()

2
templates/kilo/plumlib.ini
View File

@ -50,7 +50,7 @@ api_key = 162-22O8BEYWO0DQGIM
secret_key = 171de423af844bad400a98ea5b9fa56d secret_key = 171de423af844bad400a98ea5b9fa56d
[ConnectorType] [ConnectorType]
connector_type = distributed connector_type = {{ connector_type }}
{% if admin_user -%} {% if admin_user -%}
[keystone_authtoken] [keystone_authtoken]