diff options
| author | Bruce Ashfield <bruce.ashfield@windriver.com> | 2014-07-18 15:43:02 -0400 |
|---|---|---|
| committer | Bruce Ashfield <bruce.ashfield@windriver.com> | 2014-07-18 15:43:02 -0400 |
| commit | 231bcf46fd9d999e8ea4ef354d1ee400bef727d5 (patch) | |
| tree | 53aa2bc85be34caa4c4479cef4de749df3548a72 /meta-openstack/recipes-devtools/python/python-neutron | |
| parent | 0909491c798c55d4e4fbd5e700fe43e99b076a58 (diff) | |
| download | meta-cloud-services-231bcf46fd9d999e8ea4ef354d1ee400bef727d5.tar.gz | |
neutron: uprev to juno release
Updating neutron to the juno branches. No configuration or startup
changes were required.
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Diffstat (limited to 'meta-openstack/recipes-devtools/python/python-neutron')
| -rw-r--r-- | meta-openstack/recipes-devtools/python/python-neutron/0001-neutron.conf-jumpstart-nova-state-reporting-configur.patch | 23 |
1 files changed, 10 insertions, 13 deletions
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 <bruce.ashfield@windriver.com> | |||
| 12 | etc/neutron.conf | 6 +++--- | 12 | etc/neutron.conf | 6 +++--- |
| 13 | 1 file changed, 3 insertions(+), 3 deletions(-) | 13 | 1 file changed, 3 insertions(+), 3 deletions(-) |
| 14 | 14 | ||
| 15 | diff --git a/etc/neutron.conf b/etc/neutron.conf | 15 | Index: git/etc/neutron.conf |
| 16 | index 775c75725286..8305f1718c49 100644 | 16 | =================================================================== |
| 17 | --- a/etc/neutron.conf | 17 | --- git.orig/etc/neutron.conf |
| 18 | +++ b/etc/neutron.conf | 18 | +++ git/etc/neutron.conf |
| 19 | @@ -303,7 +303,7 @@ notification_driver = neutron.openstack.common.notifier.rpc_notifier | 19 | @@ -197,7 +197,7 @@ |
| 20 | # notify_nova_on_port_data_changes = True | 20 | # notify_nova_on_port_data_changes = True |
| 21 | 21 | ||
| 22 | # URL for connection to nova (Only supports one nova region currently). | 22 | # URL for connection to nova (Only supports one nova region currently). |
| 23 | -# nova_url = http://127.0.0.1:8774 | 23 | -# nova_url = http://127.0.0.1:8774/v2 |
| 24 | +# nova_url = http://%CONTROLLER_IP%:8774 | 24 | +# nova_url = http://%CONTROLLER_IP%:8774/v2 |
| 25 | 25 | ||
| 26 | # Name of nova region to use. Useful if keystone manages more than one region | 26 | # Name of nova region to use. Useful if keystone manages more than one region |
| 27 | # nova_region_name = | 27 | # nova_region_name = |
| 28 | @@ -315,10 +315,10 @@ notification_driver = neutron.openstack.common.notifier.rpc_notifier | 28 | @@ -209,10 +209,10 @@ |
| 29 | # nova_admin_tenant_id = | 29 | # nova_admin_tenant_id = |
| 30 | 30 | ||
| 31 | # Password for connection to nova in admin context. | 31 | # Password for connection to nova in admin context. |
| @@ -36,8 +36,5 @@ index 775c75725286..8305f1718c49 100644 | |||
| 36 | -# nova_admin_auth_url = | 36 | -# nova_admin_auth_url = |
| 37 | +# nova_admin_auth_url = http://%CONTROLLER_IP%:35357/v2.0 | 37 | +# nova_admin_auth_url = http://%CONTROLLER_IP%:35357/v2.0 |
| 38 | 38 | ||
| 39 | # Number of seconds between sending events to nova if there are any events to send | 39 | # CA file for novaclient to verify server certificates |
| 40 | # send_events_interval = 2 | 40 | # nova_ca_certificates_file = |
| 41 | -- | ||
| 42 | 1.7.10.4 | ||
| 43 | |||