From da36cfe85ae8c83b0dffaa726b1c5930f246d9aa Mon Sep 17 00:00:00 2001 From: chenxing Date: Wed, 19 Jul 2017 08:19:40 +0000 Subject: [PATCH] Update the documentation link for doc migration Change-Id: If0ac02fa98c27e96eb5307f2a6d95f694a872a52 --- HACKING.rst | 2 +- README.rst | 10 +++++----- doc/source/multi-pod-installation-devstack.rst | 10 +++++----- doc/source/single-pod-installation-devstack.rst | 6 +++--- setup.cfg | 4 ++-- tricircle/common/policy.py | 2 +- 6 files changed, 17 insertions(+), 17 deletions(-) diff --git a/HACKING.rst b/HACKING.rst index f2c7f77f..966afbf0 100644 --- a/HACKING.rst +++ b/HACKING.rst @@ -3,4 +3,4 @@ The Tricircle Style Commandments ================================ Please read the OpenStack Style Commandments - http://docs.openstack.org/developer/hacking/ + https://docs.openstack.org/hacking/latest/ diff --git a/README.rst b/README.rst index d5c3e520..2f2d8545 100644 --- a/README.rst +++ b/README.rst @@ -46,12 +46,12 @@ detailed in the LICENSE file. * Free software: Apache license * Design documentation: `Tricircle Design Blueprint `_ * Wiki: https://wiki.openstack.org/wiki/tricircle -* Installation guide: http://docs.openstack.org/developer/tricircle/installation-guide.html -* Tricircle Admin API documentation: http://docs.openstack.org/developer/tricircle/api_v1.html -* Configuration guide: http://docs.openstack.org/developer/tricircle/configuration.html -* Networking guide: http://docs.openstack.org/developer/tricircle/networking-guide.html +* Installation guide: https://docs.openstack.org/tricircle/latest/installation-guide.html +* Tricircle Admin API documentation: https://docs.openstack.org/tricircle/latest/api_v1.html +* Configuration guide: https://docs.openstack.org/tricircle/latest/configuration.html +* Networking guide: https://docs.openstack.org/tricircle/latest/networking-guide.html * Source: http://git.openstack.org/cgit/openstack/tricircle * Bugs: http://bugs.launchpad.net/tricircle * Blueprints: https://blueprints.launchpad.net/tricircle * Release notes: http://docs.openstack.org/releasenotes/tricircle -* Contributing: http://docs.openstack.org/developer/tricircle/contributing.html +* Contributing: https://docs.openstack.org/tricircle/latest/contributing.html diff --git a/doc/source/multi-pod-installation-devstack.rst b/doc/source/multi-pod-installation-devstack.rst index 3f821ac1..2463341b 100644 --- a/doc/source/multi-pod-installation-devstack.rst +++ b/doc/source/multi-pod-installation-devstack.rst @@ -78,9 +78,9 @@ too, you should prepare one more network interface in the second node for the external network. In this guide, the external network is also VLAN type, so the local.conf sample is based on VLAN type external network setup. For the resource requirements to setup each node, please refer to -`All-In-One Single Machine `_ +`All-In-One Single Machine `_ for installing DevStack in bare metal server and -`All-In-One Single VM `_ +`All-In-One Single VM `_ for installing DevStack in virtual machine. If you want to experience cross Neutron VxLAN network, please make sure @@ -95,7 +95,7 @@ In pod1 in node1 for Tricircle service, central Neutron and OpenStack RegionOne, - 1 Install DevStack. Please refer to - `DevStack document `_ + `DevStack document `_ on how to install DevStack into single VM or bare metal server. - 2 In DevStack folder, create a file local.conf, and copy the content of @@ -170,7 +170,7 @@ RegionOne, In pod2 in node2 for OpenStack RegionTwo, - 1 Install DevStack. Please refer to - `DevStack document `_ + `DevStack document `_ on how to install DevStack into single VM or bare metal server. - 2 In DevStack folder, create a file local.conf, and copy the content of @@ -235,7 +235,7 @@ In pod2 in node2 for OpenStack RegionTwo, want to try l3 north-south networking, you can simply remove the "extern" part. The external network type we use in the guide is VLAN, if you want to use other network type like flat, please refer to - `DevStack document `_. + `DevStack document `_. - 4 Create OVS bridge and attach the VLAN network interface to it :: diff --git a/doc/source/single-pod-installation-devstack.rst b/doc/source/single-pod-installation-devstack.rst index aa439d0b..60c87ff6 100644 --- a/doc/source/single-pod-installation-devstack.rst +++ b/doc/source/single-pod-installation-devstack.rst @@ -4,13 +4,13 @@ Single pod installation with DevStack Now the Tricircle can be played with all-in-one single pod DevStack. For the resource requirement to setup single pod DevStack, please refer -to `All-In-One Single Machine `_ for +to `All-In-One Single Machine `_ for installing DevStack in bare metal server -or `All-In-One Single VM `_ for +or `All-In-One Single VM `_ for installing DevStack in virtual machine. - 1 Install DevStack. Please refer to `DevStack document - `_ + `_ on how to install DevStack into single VM or bare metal server. - 2 In DevStack folder, create a file local.conf, and copy the content of diff --git a/setup.cfg b/setup.cfg index 0c6bd235..3bbff1f9 100644 --- a/setup.cfg +++ b/setup.cfg @@ -4,7 +4,7 @@ summary = The Tricircle is to provide networking automation across Neutron in mu description-file = README.rst author = OpenStack author-email = openstack-dev@lists.openstack.org -home-page = http://docs.openstack.org/developer/tricircle/ +home-page = https://docs.openstack.org/tricircle/latest/ classifier = Environment :: OpenStack Intended Audience :: Information Technology @@ -65,4 +65,4 @@ tricircle.network.type_drivers = networking_sfc.flowclassifier.drivers = tricircle_fc = tricircle.network.central_fc_driver:TricircleFcDriver networking_sfc.sfc.drivers = - tricircle_sfc = tricircle.network.central_sfc_driver:TricircleSfcDriver \ No newline at end of file + tricircle_sfc = tricircle.network.central_sfc_driver:TricircleSfcDriver diff --git a/tricircle/common/policy.py b/tricircle/common/policy.py index 0d2319b2..ece40174 100644 --- a/tricircle/common/policy.py +++ b/tricircle/common/policy.py @@ -142,7 +142,7 @@ def init(policy_file=None, rules=None, """ global _ENFORCER if not _ENFORCER: - # http://docs.openstack.org/developer/oslo.policy/usage.html + # https://docs.openstack.org/oslo.policy/latest/user/usage.html _ENFORCER = policy.Enforcer(CONF, policy_file=policy_file, rules=rules,