diff --git a/source/advanced/confetty/index.rst b/source/advanced/confetty/index.rst deleted file mode 100644 index ff9cf2779..000000000 --- a/source/advanced/confetty/index.rst +++ /dev/null @@ -1,9 +0,0 @@ -Confetty -========= - -Confetty is a client to confluent server - -.. toctree:: - :maxdepth: 2 - - confetty.rst diff --git a/source/advanced/confetty/confetty.rst b/source/advanced/confluent/client/confluent_client.rst similarity index 99% rename from source/advanced/confetty/confetty.rst rename to source/advanced/confluent/client/confluent_client.rst index 2ff9555f4..1c1bfe5b2 100644 --- a/source/advanced/confetty/confetty.rst +++ b/source/advanced/confluent/client/confluent_client.rst @@ -1,5 +1,4 @@ - Starting the confetty client ============================ diff --git a/source/advanced/confluent/client/index.rst b/source/advanced/confluent/client/index.rst new file mode 100644 index 000000000..8058d7437 --- /dev/null +++ b/source/advanced/confluent/client/index.rst @@ -0,0 +1,7 @@ +confluent-client +================ + +.. toctree:: + :maxdepth: 2 + + confluent_client.rst diff --git a/source/advanced/confluent/index.rst b/source/advanced/confluent/index.rst index cf9981ad5..dc8bb7737 100644 --- a/source/advanced/confluent/index.rst +++ b/source/advanced/confluent/index.rst @@ -12,4 +12,5 @@ Confluent is a new codebase with a few goals in mind: .. toctree:: :maxdepth: 2 - confluent.rst + server/index.rst + client/index.rst diff --git a/source/advanced/confluent/confluent.rst b/source/advanced/confluent/server/confluent_server.rst similarity index 96% rename from source/advanced/confluent/confluent.rst rename to source/advanced/confluent/server/confluent_server.rst index 11c641e6d..abda9882f 100644 --- a/source/advanced/confluent/confluent.rst +++ b/source/advanced/confluent/server/confluent_server.rst @@ -1,17 +1,18 @@ + Getting Started ---------------- +=============== For xCAT 2.9.1 and later, confluent is intended to be used in conjunction with xCAT. The following documentation assumes that xCAT is already installed and configured on the management node. Download --------- +======== confluent -~~~~~~~~~ +--------- rpms -^^^^ +~~~~ The latest confluent rpms are built and provided for your convenience: `confluent rpms `_. However, the rpms are not built on a regular release schedule. To use the latest code base, consider building the rpms from :ref:`label_confluent_source`. @@ -27,7 +28,7 @@ The following example downloads the confluent tar package and creates a local re .. _label_confluent_source: source -^^^^^^ +~~~~~~ To build from source, ensure your machine has the correct development packages to build rpms, then execute hte following: @@ -42,7 +43,7 @@ To build from source, ensure your machine has the correct development packages t confluent-dep -~~~~~~~~~~~~~ +------------- The latest confluent dependency packages are provided for your convenience: `confluent-deps `_ @@ -60,7 +61,7 @@ please send an email to the xcat-users mailing list: xcat-users@lists.sourceforg Install -------- +======= *confluent and confluent-deps must be downloaded to the management node before installing* @@ -77,10 +78,10 @@ You may find it helpful to add the confluent paths into your system path:: export MANPATH=$CONFLUENTROOT/share/man:$MANPATH Configuration -------------- +============= Starting/Stopping confluent -^^^^^^^^^^^^^^^^^^^^^^^^^^^ +--------------------------- To start confluent:: @@ -95,7 +96,7 @@ If you want confluent daemon to start automatically at bootup, add confluent ser chkconfig --add confluent Replacing conserver with confluent -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +---------------------------------- A new keyword, ``consoleservice``, has been added to the xCAT site table to allow the system administrator to control between **conserver** and **confluent**. If ``consoleservice`` is not set, default behavior is to use **conserver**. @@ -118,7 +119,7 @@ Use ``rcons`` as before to start the console session.:: Web Browser access ------------------- +================== Confluent-api and confluent-consoles are able to be accessed from the browser. It is **highly** recommended that you create a non-root user to access the sessions:: @@ -134,7 +135,7 @@ It is **highly** recommended that you create a non-root user to access the sessi password="********" Rest Explorer -^^^^^^^^^^^^^ +============= TODO: some intro text @@ -154,7 +155,7 @@ Configure the httpd configuration for confluent-api by creating a ``confluent.co Now point your browser to: ``http://:`` and log in with the non-root user and password created above. Confluent consoles -^^^^^^^^^^^^^^^^^^ +================== confluent-web is provided in a subdirectory under the confluent project `confluent_web `_ diff --git a/source/advanced/confluent/server/index.rst b/source/advanced/confluent/server/index.rst new file mode 100644 index 000000000..4af5f08c1 --- /dev/null +++ b/source/advanced/confluent/server/index.rst @@ -0,0 +1,8 @@ +confluent-server +================ + + +.. toctree:: + :maxdepth: 2 + + confluent_server.rst diff --git a/source/advanced/index.rst b/source/advanced/index.rst index 492e1d0d8..390ccab1f 100644 --- a/source/advanced/index.rst +++ b/source/advanced/index.rst @@ -5,6 +5,5 @@ Advanced Topics :maxdepth: 2 confluent/index - confetty/index docker/index mixed_cluster