From b60b2b2454f6258a1955c8312d8b51452341193d Mon Sep 17 00:00:00 2001 From: Michael Johnson Date: Thu, 19 Jan 2017 21:30:25 +0000 Subject: [PATCH] Fix the docs page title Currently the title for the octavia docs page is "Main". This updates the title to be more descriptive. This patch also updates the index for Anchor documentation and our version 1.0 specs. Change-Id: I1258503b7a778789b77c7ec6c4db1fbd310b6133 --- doc/source/index.rst | 16 +++++++++++++--- doc/source/main/Anchor.rst | 16 +++++++++------- 2 files changed, 22 insertions(+), 10 deletions(-) diff --git a/doc/source/index.rst b/doc/source/index.rst index fa574f8c5d..9d39f81f3a 100644 --- a/doc/source/index.rst +++ b/doc/source/index.rst @@ -1,8 +1,8 @@ .. octavia-specs documentation master file -==== -Main -==== +===================== +Octavia Documentation +===================== Getting started --------------- @@ -43,6 +43,7 @@ For operators guides/dev-quick-start.rst main/configref.rst + main/Anchor.rst ==== APIs @@ -99,6 +100,15 @@ Version 0.9 (newton) specs/version0.9/* +Version 1.0 +----------- + +.. toctree:: + :glob: + :maxdepth: 1 + + specs/version1/* + ================== Indices and tables ================== diff --git a/doc/source/main/Anchor.rst b/doc/source/main/Anchor.rst index 5541048a40..2c40aae599 100644 --- a/doc/source/main/Anchor.rst +++ b/doc/source/main/Anchor.rst @@ -8,13 +8,15 @@ which secure the amphora - controller communication. Basic Setup ----------- -# Download/Install/Start Anchor from https://github.com/openstack/anchor -# Change the listening port in config.py to 9999 -# I found it useful to run anchor in an additional devstack screen -# Set in octavia.conf -## [certificates] cert_generator to anchor -## [haproxy_amphora] server_ca = /opt/stack/anchor/CA/root-ca.crt (Anchor CA) -# Restart o-cw o-hm o-hk +1. Download/Install/Start Anchor from https://github.com/openstack/anchor +2. Change the listening port in config.py to 9999 +3. I found it useful to run anchor in an additional devstack screen +4. Set in octavia.conf (root-ca.crt here is the Anchor CA) + + a. [controller_worker] cert_generator = anchor + b. [haproxy_amphora] server_ca = /opt/stack/anchor/CA/root-ca.crt + +5. Restart o-cw o-hm o-hk Benefit -------