diff --git a/CHANGELOG.md b/CHANGELOG.md index 9d1814f9..5730d696 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,9 @@ 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: * Corrected a faulty Chef search query with `#config_by_role`. The search returns a Hash, not an array. diff --git a/README.md b/README.md index 29225d9f..562b9f95 100644 --- a/README.md +++ b/README.md @@ -184,10 +184,12 @@ License and Author | **Author** | Matt Ray () | | **Author** | Craig Tracey () | | **Author** | Sean Gallagher () | +| **Author** | Ionut Artarisi () | | | | | **Copyright** | Copyright (c) 2012-2013, AT&T Services, Inc. | | **Copyright** | Copyright (c) 2013, Opscode, Inc. | | **Copyright** | Copyright (c) 2013, Craig Tracey | +| **Copyright** | Copyright (c) 2013, SUSE Linux GmbH | Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/attributes/default.rb b/attributes/default.rb index 5d43b142..509140d0 100644 --- a/attributes/default.rb +++ b/attributes/default.rb @@ -3,6 +3,7 @@ # Attributes:: default # # Copyright 2012-2013, AT&T Services, Inc. +# Copyright 2013, SUSE Linux GmbH # # Licensed under the Apache License, Version 2.0 (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']['scheme'] = "https" 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 ****************************** diff --git a/metadata.rb b/metadata.rb index ba4f01bf..53a14f01 100644 --- a/metadata.rb +++ b/metadata.rb @@ -4,7 +4,7 @@ maintainer_email "cookbooks@lists.tfoundry.com" license "Apache 2.0" description "Common OpenStack attributes, libraries and recipes." 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::logging", "Installs/Configures common logging"