Merge "Use https instead of http for git.openstack.org"

This commit is contained in:
Jenkins 2017-02-06 09:37:38 +00:00 committed by Gerrit Code Review
commit 47553225ff
3 changed files with 4 additions and 4 deletions

View File

@ -70,7 +70,7 @@ target_name = 'openstack-ansible-' + role_name
title = 'OpenStack-Ansible Documentation: ' + role_name + 'role' title = 'OpenStack-Ansible Documentation: ' + role_name + 'role'
# The link to the browsable source code (for the left hand menu) # The link to the browsable source code (for the left hand menu)
oslosphinx_cgit_link = 'http://git.openstack.org/cgit/openstack/' + target_name oslosphinx_cgit_link = 'https://git.openstack.org/cgit/openstack/' + target_name
# The version info for the project you're documenting, acts as replacement for # The version info for the project you're documenting, acts as replacement for
# |version| and |release|, also used in various other places throughout the # |version| and |release|, also used in various other places throughout the
@ -89,7 +89,7 @@ version = version_info.canonical_version_string()
# Automatically extracted from git log. # Automatically extracted from git log.
# bug_tag: Tag for categorizing the bug. Must be set manually. # bug_tag: Tag for categorizing the bug. Must be set manually.
# These variables are passed to the logabug code via html_context. # These variables are passed to the logabug code via html_context.
giturl = ("http://git.openstack.org/cgit/openstack/{0}" giturl = ("https://git.openstack.org/cgit/openstack/{0}"
"/tree/doc/source").format(target_name) "/tree/doc/source").format(target_name)
git_cmd = "/usr/bin/git log | head -n1 | cut -f2 -d' '" git_cmd = "/usr/bin/git log | head -n1 | cut -f2 -d' '"
gitsha = os.popen(git_cmd).read().strip('\n') gitsha = os.popen(git_cmd).read().strip('\n')

View File

@ -65,7 +65,7 @@ target_name = 'openstack-ansible-' + role_name
title = 'OpenStack-Ansible Release Notes: ' + role_name + 'role' title = 'OpenStack-Ansible Release Notes: ' + role_name + 'role'
# The link to the browsable source code (for the left hand menu) # The link to the browsable source code (for the left hand menu)
oslosphinx_cgit_link = 'http://git.openstack.org/cgit/openstack/' + target_name oslosphinx_cgit_link = 'https://git.openstack.org/cgit/openstack/' + target_name
# The version info for the project you're documenting, acts as replacement for # The version info for the project you're documenting, acts as replacement for
# |version| and |release|, also used in various other places throughout the # |version| and |release|, also used in various other places throughout the

View File

@ -82,7 +82,7 @@ commands =
[testenv:ansible] [testenv:ansible]
deps = deps =
{[testenv]deps} {[testenv]deps}
-rhttp://git.openstack.org/cgit/openstack/openstack-ansible-tests/plain/test-ansible-deps.txt -rhttps://git.openstack.org/cgit/openstack/openstack-ansible-tests/plain/test-ansible-deps.txt
[testenv:ansible-syntax] [testenv:ansible-syntax]