From 8dc31f309316248324481c1ed3c82c5427f9b10b Mon Sep 17 00:00:00 2001 From: Skylar Saveland Date: Mon, 16 Sep 2013 13:43:20 -0700 Subject: [PATCH 1/2] ANSIBLE_DIST_MODULE_PATH environment variable --- lib/ansible/constants.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/ansible/constants.py b/lib/ansible/constants.py index b9941c2e93..eb474090ef 100644 --- a/lib/ansible/constants.py +++ b/lib/ansible/constants.py @@ -82,9 +82,12 @@ active_user = pwd.getpwuid(os.geteuid())[0] # Needed so the RPM can call setup.py and have modules land in the # correct location. See #1277 for discussion if getattr(sys, "real_prefix", None): + # in a virtualenv DIST_MODULE_PATH = os.path.join(sys.prefix, 'share/ansible/') else: DIST_MODULE_PATH = '/usr/share/ansible/' +# custom ansible location without a virtualenv +DIST_MODULE_PATH = os.environ.get("ANSIBLE_DIST_MODULE_PATH", DIST_MODULE_PATH) # sections in config file DEFAULTS='defaults' From 50bd14faa92f291c7c8857d5a7d85dd11ec15790 Mon Sep 17 00:00:00 2001 From: Skylar Saveland Date: Mon, 16 Sep 2013 19:08:22 -0700 Subject: [PATCH 2/2] use DEFAULT_MODULE_PATH in setup.py so that there is a chance to override with ANSIBLE_LIBRARY env variable --- lib/ansible/constants.py | 2 -- setup.py | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/lib/ansible/constants.py b/lib/ansible/constants.py index eb474090ef..7441126514 100644 --- a/lib/ansible/constants.py +++ b/lib/ansible/constants.py @@ -86,8 +86,6 @@ if getattr(sys, "real_prefix", None): DIST_MODULE_PATH = os.path.join(sys.prefix, 'share/ansible/') else: DIST_MODULE_PATH = '/usr/share/ansible/' -# custom ansible location without a virtualenv -DIST_MODULE_PATH = os.environ.get("ANSIBLE_DIST_MODULE_PATH", DIST_MODULE_PATH) # sections in config file DEFAULTS='defaults' diff --git a/setup.py b/setup.py index f1d23d41eb..4ae1e661d4 100644 --- a/setup.py +++ b/setup.py @@ -9,11 +9,11 @@ from ansible import __version__, __author__ from distutils.core import setup # find library modules -from ansible.constants import DIST_MODULE_PATH +from ansible.constants import DEFAULT_MODULE_PATH dirs=os.listdir("./library/") data_files = [] for i in dirs: - data_files.append((DIST_MODULE_PATH + i, glob('./library/' + i + '/*'))) + data_files.append((DEFAULT_MODULE_PATH + i, glob('./library/' + i + '/*'))) setup(name='ansible', version=__version__,