Merge "Update ansible library location to envsitepackagesdir"
This commit is contained in:
commit
ca3606a57d
|
@ -0,0 +1,15 @@
|
|||
[metadata]
|
||||
name = project-config
|
||||
summary = Infrastructure Configuration for the OpenStack Project
|
||||
description-file =
|
||||
README.rst
|
||||
author = OpenStack Infrastructure Team
|
||||
author-email = openstack-infra@lists.openstack.org
|
||||
home-page = http://www.openstack.org/
|
||||
classifier =
|
||||
Environment :: OpenStack
|
||||
Intended Audience :: Information Technology
|
||||
Intended Audience :: System Administrators
|
||||
License :: OSI Approved :: Apache Software License
|
||||
Operating System :: POSIX :: Linux
|
||||
Programming Language :: Python
|
|
@ -0,0 +1,28 @@
|
|||
# Copyright (c) 2013 Hewlett-Packard Development Company, L.P.
|
||||
#
|
||||
# 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.
|
||||
|
||||
import setuptools
|
||||
|
||||
# In python < 2.7.4, a lazy loading of package `pbr` will break
|
||||
# setuptools if some other modules registered functions in `atexit`.
|
||||
# solution from: http://bugs.python.org/issue15881#msg170215
|
||||
try:
|
||||
import multiprocessing # noqa
|
||||
except ImportError:
|
||||
pass
|
||||
|
||||
setuptools.setup(
|
||||
setup_requires=['pbr>=2.0'],
|
||||
pbr=True)
|
4
tox.ini
4
tox.ini
|
@ -11,7 +11,7 @@ passenv = http_proxy HTTP_PROXY https_proxy HTTPS_PROXY no_proxy NO_PROXY
|
|||
basepython = python3
|
||||
whitelist_externals = bash
|
||||
setenv =
|
||||
ANSIBLE_LIBRARY= {envdir}/src/zuul/zuul/ansible/library
|
||||
ANSIBLE_LIBRARY= {envsitepackagesdir}/zuul/ansible/library
|
||||
# NOTE(pabelanger): if you'd like to run tox -elinters locally,
|
||||
# you'll need to export ANSIBLE_ROLES_PATH pointing to the required
|
||||
# repos.
|
||||
|
@ -28,7 +28,7 @@ setenv =
|
|||
# python3.
|
||||
deps =
|
||||
# Zuul is required to supply the zuul ansible modules for ansible-lint
|
||||
-egit+https://git.openstack.org/openstack-infra/zuul#egg=zuul
|
||||
zuul
|
||||
# Unfortunately pip doesn't do actual dependency resolution, so
|
||||
# we need to manually ansible at the top level to the same as
|
||||
# zuul requirements.txt
|
||||
|
|
Loading…
Reference in New Issue