summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorgecong1973 <ge.cong@zte.com.cn>2017-02-06 11:34:36 +0800
committergecong1973 <ge.cong@zte.com.cn>2017-02-06 11:34:36 +0800
commitffce210f9b43ee41645dcc388931b11b4b8210cd (patch)
tree5b8923679428b41fa3d85c6cca7bda4043a8081d
parent5f0defd39bb723f3b6124c9f4fa15387e6f474e1 (diff)
Use https instead of http for git.openstack.org
Notes
Notes (review): Code-Review+2: Jesse Pretorius (odyssey4me) <jesse.pretorius@rackspace.co.uk> Workflow+1: Jesse Pretorius (odyssey4me) <jesse.pretorius@rackspace.co.uk> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Mon, 06 Feb 2017 09:13:29 +0000 Reviewed-on: https://review.openstack.org/429458 Project: openstack/openstack-ansible-memcached_server Branch: refs/heads/master
-rw-r--r--doc/source/conf.py4
-rw-r--r--releasenotes/source/conf.py2
-rw-r--r--tox.ini2
3 files changed, 4 insertions, 4 deletions
diff --git a/doc/source/conf.py b/doc/source/conf.py
index c157270..bdfb2c8 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -70,7 +70,7 @@ target_name = 'openstack-ansible-' + role_name
70title = 'OpenStack-Ansible Documentation: ' + role_name + 'role' 70title = 'OpenStack-Ansible Documentation: ' + role_name + 'role'
71 71
72# The link to the browsable source code (for the left hand menu) 72# The link to the browsable source code (for the left hand menu)
73oslosphinx_cgit_link = 'http://git.openstack.org/cgit/openstack/' + target_name 73oslosphinx_cgit_link = 'https://git.openstack.org/cgit/openstack/' + target_name
74 74
75# The version info for the project you're documenting, acts as replacement for 75# The version info for the project you're documenting, acts as replacement for
76# |version| and |release|, also used in various other places throughout the 76# |version| and |release|, also used in various other places throughout the
@@ -89,7 +89,7 @@ version = version_info.canonical_version_string()
89# Automatically extracted from git log. 89# Automatically extracted from git log.
90# bug_tag: Tag for categorizing the bug. Must be set manually. 90# bug_tag: Tag for categorizing the bug. Must be set manually.
91# These variables are passed to the logabug code via html_context. 91# These variables are passed to the logabug code via html_context.
92giturl = ("http://git.openstack.org/cgit/openstack/{0}" 92giturl = ("https://git.openstack.org/cgit/openstack/{0}"
93 "/tree/doc/source").format(target_name) 93 "/tree/doc/source").format(target_name)
94git_cmd = "/usr/bin/git log | head -n1 | cut -f2 -d' '" 94git_cmd = "/usr/bin/git log | head -n1 | cut -f2 -d' '"
95gitsha = os.popen(git_cmd).read().strip('\n') 95gitsha = os.popen(git_cmd).read().strip('\n')
diff --git a/releasenotes/source/conf.py b/releasenotes/source/conf.py
index 69c314b..dfd765a 100644
--- a/releasenotes/source/conf.py
+++ b/releasenotes/source/conf.py
@@ -65,7 +65,7 @@ target_name = 'openstack-ansible-' + role_name
65title = 'OpenStack-Ansible Release Notes: ' + role_name + 'role' 65title = 'OpenStack-Ansible Release Notes: ' + role_name + 'role'
66 66
67# The link to the browsable source code (for the left hand menu) 67# The link to the browsable source code (for the left hand menu)
68oslosphinx_cgit_link = 'http://git.openstack.org/cgit/openstack/' + target_name 68oslosphinx_cgit_link = 'https://git.openstack.org/cgit/openstack/' + target_name
69 69
70# The version info for the project you're documenting, acts as replacement for 70# The version info for the project you're documenting, acts as replacement for
71# |version| and |release|, also used in various other places throughout the 71# |version| and |release|, also used in various other places throughout the
diff --git a/tox.ini b/tox.ini
index 9996138..665b8c3 100644
--- a/tox.ini
+++ b/tox.ini
@@ -82,7 +82,7 @@ commands =
82[testenv:ansible] 82[testenv:ansible]
83deps = 83deps =
84 {[testenv]deps} 84 {[testenv]deps}
85 -rhttp://git.openstack.org/cgit/openstack/openstack-ansible-tests/plain/test-ansible-deps.txt 85 -rhttps://git.openstack.org/cgit/openstack/openstack-ansible-tests/plain/test-ansible-deps.txt
86 86
87 87
88[testenv:ansible-syntax] 88[testenv:ansible-syntax]