From 231bcf46fd9d999e8ea4ef354d1ee400bef727d5 Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Fri, 18 Jul 2014 15:43:02 -0400 Subject: neutron: uprev to juno release Updating neutron to the juno branches. No configuration or startup changes were required. Signed-off-by: Bruce Ashfield --- ...f-jumpstart-nova-state-reporting-configur.patch | 23 ++++++++++------------ .../recipes-devtools/python/python-neutron_git.bb | 6 +++--- 2 files changed, 13 insertions(+), 16 deletions(-) (limited to 'meta-openstack/recipes-devtools') diff --git a/meta-openstack/recipes-devtools/python/python-neutron/0001-neutron.conf-jumpstart-nova-state-reporting-configur.patch b/meta-openstack/recipes-devtools/python/python-neutron/0001-neutron.conf-jumpstart-nova-state-reporting-configur.patch index 5589296..dbe55db 100644 --- a/meta-openstack/recipes-devtools/python/python-neutron/0001-neutron.conf-jumpstart-nova-state-reporting-configur.patch +++ b/meta-openstack/recipes-devtools/python/python-neutron/0001-neutron.conf-jumpstart-nova-state-reporting-configur.patch @@ -12,20 +12,20 @@ Signed-off-by: Bruce Ashfield etc/neutron.conf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -diff --git a/etc/neutron.conf b/etc/neutron.conf -index 775c75725286..8305f1718c49 100644 ---- a/etc/neutron.conf -+++ b/etc/neutron.conf -@@ -303,7 +303,7 @@ notification_driver = neutron.openstack.common.notifier.rpc_notifier +Index: git/etc/neutron.conf +=================================================================== +--- git.orig/etc/neutron.conf ++++ git/etc/neutron.conf +@@ -197,7 +197,7 @@ # notify_nova_on_port_data_changes = True # URL for connection to nova (Only supports one nova region currently). --# nova_url = http://127.0.0.1:8774 -+# nova_url = http://%CONTROLLER_IP%:8774 +-# nova_url = http://127.0.0.1:8774/v2 ++# nova_url = http://%CONTROLLER_IP%:8774/v2 # Name of nova region to use. Useful if keystone manages more than one region # nova_region_name = -@@ -315,10 +315,10 @@ notification_driver = neutron.openstack.common.notifier.rpc_notifier +@@ -209,10 +209,10 @@ # nova_admin_tenant_id = # Password for connection to nova in admin context. @@ -36,8 +36,5 @@ index 775c75725286..8305f1718c49 100644 -# nova_admin_auth_url = +# nova_admin_auth_url = http://%CONTROLLER_IP%:35357/v2.0 - # Number of seconds between sending events to nova if there are any events to send - # send_events_interval = 2 --- -1.7.10.4 - + # CA file for novaclient to verify server certificates + # nova_ca_certificates_file = diff --git a/meta-openstack/recipes-devtools/python/python-neutron_git.bb b/meta-openstack/recipes-devtools/python/python-neutron_git.bb index 2f88e44..ebe76b2 100644 --- a/meta-openstack/recipes-devtools/python/python-neutron_git.bb +++ b/meta-openstack/recipes-devtools/python/python-neutron_git.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2" PR = "r0" SRCNAME = "neutron" -SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/icehouse \ +SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=master \ file://ovs_neutron_plugin.ini \ file://linuxbridge_conf.ini \ file://neutron-server.init \ @@ -20,8 +20,8 @@ SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/icehouse \ file://uuid_wscheck.patch \ file://neutron-test-nec-plugin-extensions-location.patch \ " -SRCREV="e0deffc71e5031059530b9b6c2ef3b0765de3d10" -PV="2014.1+git${SRCPV}" +SRCREV="57011b901f0c26c840c207e007e392ba9ff5890b" +PV="2014.2.b1+git${SRCPV}" S = "${WORKDIR}/git" -- cgit v1.2.3-54-g00ecf