fix quantum endpoint path

quantumclient appends the API version to the url, which would result in
faulty urls like https://localhost:9696/v2/v2.0/...

Change-Id: I6b0b97db7c02d54b517bff106472c0a8a3fa22c6
This commit is contained in:
Ionuț Arțăriși
2013-07-10 16:12:26 +02:00
parent d7d2a2476d
commit 1ec5a0744c
4 changed files with 10 additions and 2 deletions

View File

@@ -2,6 +2,9 @@
This file is used to list changes made in each version of cookbook-openstack-common. This file is used to list changes made in each version of cookbook-openstack-common.
## 0.3.2:
* Fix network-api endpoint path
## 0.3.1: ## 0.3.1:
* Corrected a faulty Chef search query with `#config_by_role`. The search returns a * Corrected a faulty Chef search query with `#config_by_role`. The search returns a
Hash, not an array. Hash, not an array.

View File

@@ -184,10 +184,12 @@ License and Author
| **Author** | Matt Ray (<matt@opscode.com>) | | **Author** | Matt Ray (<matt@opscode.com>) |
| **Author** | Craig Tracey (<craigtracey@gmail.com>) | | **Author** | Craig Tracey (<craigtracey@gmail.com>) |
| **Author** | Sean Gallagher (<sean.gallagher@att.com>) | | **Author** | Sean Gallagher (<sean.gallagher@att.com>) |
| **Author** | Ionut Artarisi (<iartarisi@suse.cz>) |
| | | | | |
| **Copyright** | Copyright (c) 2012-2013, AT&T Services, Inc. | | **Copyright** | Copyright (c) 2012-2013, AT&T Services, Inc. |
| **Copyright** | Copyright (c) 2013, Opscode, Inc. | | **Copyright** | Copyright (c) 2013, Opscode, Inc. |
| **Copyright** | Copyright (c) 2013, Craig Tracey | | **Copyright** | Copyright (c) 2013, Craig Tracey |
| **Copyright** | Copyright (c) 2013, SUSE Linux GmbH |
Licensed under the Apache License, Version 2.0 (the "License"); Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License. you may not use this file except in compliance with the License.

View File

@@ -3,6 +3,7 @@
# Attributes:: default # Attributes:: default
# #
# Copyright 2012-2013, AT&T Services, Inc. # Copyright 2012-2013, AT&T Services, Inc.
# Copyright 2013, SUSE Linux GmbH
# #
# Licensed under the Apache License, Version 2.0 (the "License"); # Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License. # you may not use this file except in compliance with the License.
@@ -162,7 +163,9 @@ default['openstack']['endpoints']['compute-novnc']['path'] = "/vnc_auto.html"
default['openstack']['endpoints']['network-api']['host'] = "127.0.0.1" default['openstack']['endpoints']['network-api']['host'] = "127.0.0.1"
default['openstack']['endpoints']['network-api']['scheme'] = "https" default['openstack']['endpoints']['network-api']['scheme'] = "https"
default['openstack']['endpoints']['network-api']['port'] = "9696" default['openstack']['endpoints']['network-api']['port'] = "9696"
default['openstack']['endpoints']['network-api']['path'] = "/v2" # quantumclient appends the protocol version to the endpoint URL, so the
# path needs to be empty
default['openstack']['endpoints']['network-api']['path'] = ""
# ******************** OpenStack Image Endpoints ****************************** # ******************** OpenStack Image Endpoints ******************************

View File

@@ -4,7 +4,7 @@ maintainer_email "cookbooks@lists.tfoundry.com"
license "Apache 2.0" license "Apache 2.0"
description "Common OpenStack attributes, libraries and recipes." description "Common OpenStack attributes, libraries and recipes."
long_description IO.read(File.join(File.dirname(__FILE__), 'README.md')) long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
version "0.3.1" version "0.3.2"
recipe "openstack-common", "Installs/Configures common recipes" recipe "openstack-common", "Installs/Configures common recipes"
recipe "openstack-common::logging", "Installs/Configures common logging" recipe "openstack-common::logging", "Installs/Configures common logging"