Various fixes to get tox and verification working
The charm-helpers project moved from launchpad to github. Create a copyright file to work around pep8 warning. Fix keystone.service_catalog.url_for calls to use 'interface' parameter versus 'endpoint_type'. Add .stestr to .gitignore file. Change-Id: I215b09b97e4cd9ebbad5dcb41a03d0c09dcfd9ef
This commit is contained in:
parent
a8e70b4d34
commit
c48067bc55
|
@ -7,3 +7,4 @@ deps
|
|||
.testrepository
|
||||
__pycache__
|
||||
*.pyc
|
||||
.stestr
|
||||
|
|
|
@ -0,0 +1,16 @@
|
|||
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0
|
||||
|
||||
Files: *
|
||||
Copyright: 2012, Canonical Ltd.
|
||||
License: Apache-2.0
|
||||
Licensed under the Apache License, Version 2.0 (the "License"); you may
|
||||
not use this file except in compliance with the License. You may obtain
|
||||
a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
||||
WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
||||
License for the specific language governing permissions and limitations
|
||||
under the License.See the LICENSE file in the root directory.
|
|
@ -1,7 +1,7 @@
|
|||
# charm-proof
|
||||
charm-tools>=2.0.0
|
||||
# amulet deployment helpers
|
||||
bzr+lp:charm-helpers#egg=charmhelpers
|
||||
git+https://github.com/juju/charm-helpers
|
||||
# BEGIN: Amulet OpenStack Charm Helper Requirements
|
||||
# Liberty client lower constraints
|
||||
amulet>=1.14.3,<2.0
|
||||
|
|
|
@ -102,10 +102,10 @@ class TroveBasicDeployment(amulet_deployment.OpenStackAmuletDeployment):
|
|||
# Authenticate admin with trove endpoint
|
||||
trove_ep = self.keystone.service_catalog.url_for(
|
||||
service_type='database',
|
||||
endpoint_type='publicURL')
|
||||
interface='publicURL')
|
||||
keystone_ep = self.keystone.service_catalog.url_for(
|
||||
service_type='identity',
|
||||
endpoint_type='publicURL')
|
||||
interface='publicURL')
|
||||
self.trove = trove_client.Client(
|
||||
version='1.0',
|
||||
auth_url=keystone_ep,
|
||||
|
|
Loading…
Reference in New Issue