Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/configurable galaxy #1

Open
wants to merge 6 commits into
base: stable-1.9
Choose a base branch
from
Open

Feature/configurable galaxy #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6751f6d
Use custom download url if supplied by galaxy
javiplx Feb 13, 2016
60a3ec8
Allow galaxy server to be specified on ansible.cfg
javiplx Feb 13, 2016
c79c1c4
Make HTTP schema explicit on galaxy server name
Feb 15, 2016
e89007d
Use the same env var for galaxy than ansible 2.x
javiplx Feb 15, 2016
86fa08a
Use specific galaxy section as done by 2.x
javiplx Feb 17, 2016
56c1db9
Use a non-existing key to hold download url
javiplx Mar 9, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 14 additions & 10 deletions bin/ansible-galaxy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ def build_option_parser(action):

if action in ("info","init","install"):
parser.add_option(
'-s', '--server', dest='api_server', default="galaxy.ansible.com",
'-s', '--server', dest='api_server', default=C.GALAXY_SERVER,
help='The API server destination')
parser.add_option('-c', '--ignore-certs', action='store_true', dest='ignore_certs', default=False,
help='Ignore SSL certificate validation errors.')
Expand Down Expand Up @@ -257,7 +257,7 @@ def api_get_config(api_server, ignore_certs=False):
validate_certs = False

try:
url = 'https://%s/api/' % api_server
url = '%s/api/' % api_server
data = json.load(open_url(url, validate_certs=validate_certs))
if not data.get("current_version",None):
return None
Expand Down Expand Up @@ -288,7 +288,7 @@ def api_lookup_role_by_name(api_server, role_name, parser, notify=True, ignore_c
print "- invalid role name (%s). Specify role as format: username.rolename" % role_name
sys.exit(1)

url = 'https://%s/api/v1/roles/?owner__username=%s&name=%s' % (api_server,user_name,role_name)
url = '%s/api/v1/roles/?owner__username=%s&name=%s' % (api_server,user_name,role_name)
try:
data = json.load(open_url(url, validate_certs=validate_certs))
if len(data["results"]) == 0:
Expand All @@ -309,12 +309,12 @@ def api_fetch_role_related(api_server, related, role_id, ignore_certs=False):
validate_certs = False

try:
url = 'https://%s/api/v1/roles/%d/%s/?page_size=50' % (api_server, int(role_id), related)
url = '%s/api/v1/roles/%d/%s/?page_size=50' % (api_server, int(role_id), related)
data = json.load(open_url(url, validate_certs=validate_certs))
results = data['results']
done = (data.get('next_link', None) == None)
while not done:
url = 'https://%s%s' % (api_server, data['next_link'])
url = '%s%s' % (api_server, data['next_link'])
print url
data = json.load(open_url(url))
results += data['results']
Expand All @@ -333,7 +333,7 @@ def api_get_list(api_server, what, ignore_certs=False):
validate_certs = False

try:
url = 'https://%s/api/v1/%s/?page_size' % (api_server, what)
url = '%s/api/v1/%s/?page_size' % (api_server, what)
data = json.load(open_url(url, validate_certs=validate_certs))
if "results" in data:
results = data['results']
Expand All @@ -343,7 +343,7 @@ def api_get_list(api_server, what, ignore_certs=False):
if "next_link" in data:
done = (data.get('next_link', None) == None)
while not done:
url = 'https://%s%s' % (api_server, data['next_link'])
url = '%s%s' % (api_server, data['next_link'])
print url
data = json.load(open_url(url))
results += data['results']
Expand Down Expand Up @@ -606,7 +606,7 @@ def execute_init(args, options, parser):
"""

init_path = get_opt(options, 'init_path', './')
api_server = get_opt(options, "api_server", "galaxy.ansible.com")
api_server = get_opt(options, "api_server", C.GALAXY_SERVER)
force = get_opt(options, 'force', False)
offline = get_opt(options, 'offline', False)
ignore_certs = get_opt(options, 'ignore_certs', False)
Expand Down Expand Up @@ -709,7 +709,7 @@ def execute_info(args, options, parser):
print "- you must specify a user/role name"
sys.exit(1)

api_server = get_opt(options, "api_server", "galaxy.ansible.com")
api_server = get_opt(options, "api_server", C.GALAXY_SERVER)
api_config = api_get_config(api_server)
roles_path = get_opt(options, "roles_path")
ignore_certs = get_opt(options, "ignore_certs", False)
Expand Down Expand Up @@ -778,7 +778,7 @@ def execute_install(args, options, parser):
print "- please specify a user/role name, or a roles file, but not both"
sys.exit(1)

api_server = get_opt(options, "api_server", "galaxy.ansible.com")
api_server = get_opt(options, "api_server", C.GALAXY_SERVER)
no_deps = get_opt(options, "no_deps", False)
roles_path = get_opt(options, "roles_path")
ignore_certs = get_opt(options, "ignore_certs")
Expand Down Expand Up @@ -851,6 +851,10 @@ def execute_install(args, options, parser):
exit_without_ignore(options)
continue

matched_version = filter( lambda v : v['name'] == role['version'] , role_versions )
if len(matched_version) == 1 :
role_src = matched_version[0].get('download', role_src) or role_src

# download the role. if --no-deps was specified, we stop here,
# otherwise we recursively grab roles and all of their deps.
tmp_file = fetch_role(role_src, role["version"], role_data, options)
Expand Down
3 changes: 3 additions & 0 deletions lib/ansible/constants.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,9 @@ def shell_expand_path(path):
DEFAULT_GATHERING = get_config(p, DEFAULTS, 'gathering', 'ANSIBLE_GATHERING', 'implicit').lower()
DEFAULT_LOG_PATH = shell_expand_path(get_config(p, DEFAULTS, 'log_path', 'ANSIBLE_LOG_PATH', ''))

# galaxy related
GALAXY_SERVER = get_config(p, 'galaxy', 'server', 'ANSIBLE_GALAXY_SERVER', 'https://galaxy.ansible.com')

# selinux
DEFAULT_SELINUX_SPECIAL_FS = get_config(p, 'selinux', 'special_context_filesystems', None, 'fuse, nfs, vboxsf', islist=True)

Expand Down