You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by db...@apache.org on 2016/02/18 17:14:59 UTC
[08/13] incubator-trafodion git commit: [TRAFODION-1810] New
provisioning guide. [TRAFODION-1822] Use new Apache Logo: Added new logo.
[TRAFODION-1827] Broken link
[TRAFODION-1810] New provisioning guide.
[TRAFODION-1822] Use new Apache Logo: Added new logo.
[TRAFODION-1827] Broken link
Shrunk width of navigation panel for web books. Updated feedback text to
suggest contribution in all guides.
Please update the website. Build the 1.3.0 and 2.0.0 version of the
Provisioning Guide.
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/b19faadf
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/b19faadf
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/b19faadf
Branch: refs/heads/master
Commit: b19faadfdea985cec4dcd1fc2657efb9af18325b
Parents: 8ff1448
Author: Gunnar Tapper <gt...@esgyn.local>
Authored: Wed Feb 17 01:34:00 2016 -0700
Committer: Gunnar Tapper <gt...@esgyn.local>
Committed: Wed Feb 17 01:34:00 2016 -0700
----------------------------------------------------------------------
.../src/asciidoc/_chapters/about.adoc | 3 +-
.../src/asciidoc/_chapters/about.adoc | 2 +
.../src/asciidoc/_chapters/about.adoc | 3 +-
docs/odb_user/src/asciidoc/_chapters/about.adoc | 3 +-
.../src/asciidoc/_chapters/about.adoc | 15 +-
.../src/asciidoc/_chapters/activate.adoc | 2 +
.../src/asciidoc/_chapters/enable_security.adoc | 14 +-
.../src/asciidoc/_chapters/introduction.adoc | 58 ++-
.../src/asciidoc/_chapters/prepare.adoc | 43 +-
.../src/asciidoc/_chapters/recipe_install.adoc | 29 ++
.../src/asciidoc/_chapters/recipe_upgrade.adoc | 30 ++
.../src/asciidoc/_chapters/requirements.adoc | 5 +-
.../src/asciidoc/_chapters/script_install.adoc | 346 +++++++++-------
.../src/asciidoc/_chapters/script_remove.adoc | 24 +-
.../src/asciidoc/_chapters/script_upgrade.adoc | 410 ++++++++++++++++++-
docs/shared/trafodion-manuals.css | 2 +-
.../src/asciidoc/_chapters/about.adoc | 3 +-
docs/src/site/markdown/documentation.md | 3 +
docs/src/site/markdown/download.md | 14 +-
.../site/markdown/enable-secure-trafodion.md | 210 +---------
docs/src/site/markdown/install-preparation.md | 138 -------
docs/src/site/markdown/install-troubleshoot.md | 21 -
docs/src/site/markdown/install.md | 202 ---------
docs/src/site/markdown/ldapcheck.md | 28 +-
docs/src/site/markdown/ldapconfigcheck.md | 36 +-
docs/src/site/markdown/port-assignment.md | 134 ------
docs/src/site/markdown/uninstall.md | 176 --------
docs/src/site/site.xml | 24 +-
28 files changed, 797 insertions(+), 1181 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/b19faadf/docs/client_install/src/asciidoc/_chapters/about.adoc
----------------------------------------------------------------------
diff --git a/docs/client_install/src/asciidoc/_chapters/about.adoc b/docs/client_install/src/asciidoc/_chapters/about.adoc
index 3b14fd7..bbc0d9f 100644
--- a/docs/client_install/src/asciidoc/_chapters/about.adoc
+++ b/docs/client_install/src/asciidoc/_chapters/about.adoc
@@ -172,4 +172,5 @@ needs. Send any errors found, suggestions for improvement, or compliments to:
issues@trafodion.incubator.apache.org
Include the document title and any comment, error found, or suggestion for improvement you have concerning this document.
-
+Or, even better, join our community and help us improve our documentation. Please refer to
+http://trafodion.incubator.apache.org/contributing_redirect.html[Trafodion Contributor Guide] for details.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/b19faadf/docs/command_interface/src/asciidoc/_chapters/about.adoc
----------------------------------------------------------------------
diff --git a/docs/command_interface/src/asciidoc/_chapters/about.adoc b/docs/command_interface/src/asciidoc/_chapters/about.adoc
index 3dc6d3a..6a7c672 100644
--- a/docs/command_interface/src/asciidoc/_chapters/about.adoc
+++ b/docs/command_interface/src/asciidoc/_chapters/about.adoc
@@ -172,4 +172,6 @@ needs. Send any errors found, suggestions for improvement, or compliments to:
issues@trafodion.incubator.apache.org
Include the document title and any comment, error found, or suggestion for improvement you have concerning this document.
+Or, even better, join our community and help us improve our documentation. Please refer to
+http://trafodion.incubator.apache.org/contributing_redirect.html[Trafodion Contributor Guide] for details.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/b19faadf/docs/messages_guide/src/asciidoc/_chapters/about.adoc
----------------------------------------------------------------------
diff --git a/docs/messages_guide/src/asciidoc/_chapters/about.adoc b/docs/messages_guide/src/asciidoc/_chapters/about.adoc
index 21c02c3..3b4bab4 100644
--- a/docs/messages_guide/src/asciidoc/_chapters/about.adoc
+++ b/docs/messages_guide/src/asciidoc/_chapters/about.adoc
@@ -177,4 +177,5 @@ needs. Send any errors found, suggestions for improvement, or compliments to:
issues@trafodion.incubator.apache.org
Include the document title and any comment, error found, or suggestion for improvement you have concerning this document.
-
+Or, even better, join our community and help us improve our documentation. Please refer to
+http://trafodion.incubator.apache.org/contributing_redirect.html[Trafodion Contributor Guide] for details.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/b19faadf/docs/odb_user/src/asciidoc/_chapters/about.adoc
----------------------------------------------------------------------
diff --git a/docs/odb_user/src/asciidoc/_chapters/about.adoc b/docs/odb_user/src/asciidoc/_chapters/about.adoc
index 6a75256..f7128a7 100644
--- a/docs/odb_user/src/asciidoc/_chapters/about.adoc
+++ b/docs/odb_user/src/asciidoc/_chapters/about.adoc
@@ -179,4 +179,5 @@ needs. Send any errors found, suggestions for improvement, or compliments to:
issues@trafodion.incubator.apache.org
Include the document title and any comment, error found, or suggestion for improvement you have concerning this document.
-
+Or, even better, join our community and help us improve our documentation. Please refer to
+http://trafodion.incubator.apache.org/contributing_redirect.html[Trafodion Contributor Guide] for details.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/b19faadf/docs/provisioning_guide/src/asciidoc/_chapters/about.adoc
----------------------------------------------------------------------
diff --git a/docs/provisioning_guide/src/asciidoc/_chapters/about.adoc b/docs/provisioning_guide/src/asciidoc/_chapters/about.adoc
index c22748a..149c234 100644
--- a/docs/provisioning_guide/src/asciidoc/_chapters/about.adoc
+++ b/docs/provisioning_guide/src/asciidoc/_chapters/about.adoc
@@ -24,19 +24,22 @@
////
= About This Document
-This guide describes how to provision Trafodion for end-user environments. This install allows you to store and query data using Trafodion, either via Trafodion clients
+This guide describes how to provision the end-user Trafodion binaries ontop of an existing Hadoop environment. This install allows you to store and query data using Trafodion, either via Trafodion clients
(see http://trafodion.incubator.apache.org/client_install/index.html[Trafodion Client Installation Guide] or via application code you write.
If you want to install a Trafodion developer-build environment, then please refer to the
http://trafodion.incubator.apache.org/contributing_redirect.html[Trafodion Contributor Guide] for instructions.
== Intended Audience
-This guide is intended for:
+This guide assumes that you are well-versed in Linux and Hadoop administration. If you don't have such experience, then
+you should consider going through the steps required to install a Hadoop environment before attempting to install Trafodion.
-* *Single-Node Environments*: Typically used when you want to evalulate Trafodion.
+The instructions contained herein applies to the following environments.
+
+* *Single-Node Environments*: Typically used when you want to evaluate Trafodion.
* *Cluster (Multi-Node) Environments*: Typically used when you deploy Trafodion for application usage.
-NOTE: Trafodion can be provisioned on a single-node or multi-node enviroment. Unless specifically noted, the term *cluster* is used
+NOTE: Trafodion can be provisioned on a single-node or multi-node environment. Unless specifically noted, the term *cluster* is used
to mean both single- and multi-node environments.
The provisioning instructions applies to a diverse set of platforms:
@@ -46,12 +49,13 @@ The provisioning instructions applies to a diverse set of platforms:
* *Bare Metal*: Used for Product Environments as well as for Developer Environments.
NOTE: The term *node* is used to represent a computing platform on which operating system, Hadoop, and Trafodion software is running.
-Unless specifically qualified (bare-metal node, virtual-machin node, or cloud-node), *node* represents a computing platform in your cluster
+Unless specifically qualified (bare-metal node, virtual-machine node, or cloud-node), *node* represents a computing platform in your cluster
regardless of platform type.
== New and Changed Information
This is a new guide.
+<<<
== Notation Conventions
This list summarizes the notation conventions for syntax presentation in this manual.
@@ -90,6 +94,7 @@ DROP SCHEMA schema [CASCADE]
DROP SCHEMA schema [ CASCADE | RESTRICT ]
```
+<<<
* { } Braces
+
Braces enclose required syntax items.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/b19faadf/docs/provisioning_guide/src/asciidoc/_chapters/activate.adoc
----------------------------------------------------------------------
diff --git a/docs/provisioning_guide/src/asciidoc/_chapters/activate.adoc b/docs/provisioning_guide/src/asciidoc/_chapters/activate.adoc
index 0bedc5d..f785c42 100644
--- a/docs/provisioning_guide/src/asciidoc/_chapters/activate.adoc
+++ b/docs/provisioning_guide/src/asciidoc/_chapters/activate.adoc
@@ -70,6 +70,7 @@ drop table table1;
exit;
```
+<<<
*Example*
```
@@ -122,6 +123,7 @@ A
$
```
+<<<
Assuming no errors, your installation has been successful. Next, do the following:
* Install the Trafodion client software. Refer to the http://trafodion.apache.org/docs/client_install/index.html[Trafodion Client Installation Guide].
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/b19faadf/docs/provisioning_guide/src/asciidoc/_chapters/enable_security.adoc
----------------------------------------------------------------------
diff --git a/docs/provisioning_guide/src/asciidoc/_chapters/enable_security.adoc b/docs/provisioning_guide/src/asciidoc/_chapters/enable_security.adoc
index d4d1bea..752e025 100644
--- a/docs/provisioning_guide/src/asciidoc/_chapters/enable_security.adoc
+++ b/docs/provisioning_guide/src/asciidoc/_chapters/enable_security.adoc
@@ -26,7 +26,7 @@
[[enable-security]]
= Enable Security
-If you do not enable security in Trafodion, then a client interface to Trafodion may request a username and password,
+If you do not enable security in Trafodion, then a client interface to Trafodion may request a user name and password,
but Trafodion ignores the user name and password entered in the client interface, and the session runs as the database *root* user,
`DB__ROOT`, without restrictions. If you want to restrict users, restrict access to certain users only, or restrict access to an
object or operation, then you must enable security, which enforces authentication and authorization. You can enable security
@@ -144,8 +144,9 @@ ldapcheck --username=realuser@company.com --password=StrongPassword
Authentication successful
```
+<<<
[[enable-security-generate-trafodion-certificate]]
-== Generate a Trafodion Certificate
+== Generate Trafodion Certificate
Trafodion clients such as `trafci` encrypt the password before sending it to Trafodion. A self-signed certificate is used to encrypt the password.
The certificate and key should be generated when the `sqgen` script is invoked. By default, the files `server.key` and `server.crt` are located
in `$HOME/sqcert`. If those files are not present and since Trafodion clients does not send unencrypted passwords, then you need to manually generate
@@ -228,7 +229,7 @@ The results of this operation is logged in `$MY_SQROOT/logs/authEnable.log`.
| --setup | Use this option if the Trafodion metadata has not been initialized. This option enables authentication but does not call the database
to create privilege-related metadata tables. Later, when Trafodion metadata is initialized, privilege-related metadata tables and default permissions
are automatically created.
-| --status | Reports the value of the environment variable `TRAFODION_ENABLE_AUTHENTICATI+ON` in `$MY_SQROOT/sqenvcom.sh` on the current node and
+| --status | Reports the value of the environment variable `TRAFODION_ENABLE_AUTHENTICATION` in `$MY_SQROOT/sqenvcom.sh` on the current node and
reports the status of security features in the database.
|===
@@ -285,6 +286,8 @@ If the environment variable is not set, then Trafodion next checks the variable
If neither is set, Trafodion defaults to `$MY_SQROOT/sql/scripts/.traf_authentication_config`.
+<<<
+[[enable-security-template]]
=== Template
```
@@ -340,7 +343,7 @@ SECTION: local
[[enable-security-configuration-attributes]]
=== Configuration Attributes
-[cols="20%,20%,20%l,40%",options="header"]
+[cols="25%,20%,20%l,35%",options="header"]
|===
| Attribute Name | Purpose | Example Value | Notes
| `LDAPHostName` | Host name of the local LDAP server. | ldap.master.com | If more than one `LDAPHostName` entry is provided,
@@ -434,6 +437,7 @@ to the configured LDAP server(s) without knowing a valid username or password.
== ldapconfigcheck
This page describes the `ldapconfigcheck` tool, which validates the syntactic correctness of a Trafodion authentication configuration file. Trafodion does not need to be running to run the tool.
+[[enable-security-ldapconfigcheck-considerations]]
=== Considerations
If the configuration filename is not specified, then the tool looks for a file using environment variables. Those environment variables and the search order are:
@@ -449,6 +453,8 @@ Filename `.traf_authentication_config/` is appended to the specified directory
+
`/sql/scripts/.traf_authentication_config` is appended to the value of `MY_SQROOT`.
+<<<
+[[enable-security-ldapconfigcheck-errors]]
=== Errors
One of the following is output when the tool is run. Only the first error encountered is reported.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/b19faadf/docs/provisioning_guide/src/asciidoc/_chapters/introduction.adoc
----------------------------------------------------------------------
diff --git a/docs/provisioning_guide/src/asciidoc/_chapters/introduction.adoc b/docs/provisioning_guide/src/asciidoc/_chapters/introduction.adoc
index 0a305c8..b327245 100644
--- a/docs/provisioning_guide/src/asciidoc/_chapters/introduction.adoc
+++ b/docs/provisioning_guide/src/asciidoc/_chapters/introduction.adoc
@@ -34,7 +34,7 @@ standard JDBC and ODBC APIs.
You may choose whether to add Trafodion to an existing Hadoop environment or to create a standalone
Hadoop environment specifically for Hadoop.
-Thsi guide assumes that a Hadoop environment exists upon which your provisioning Trafodion. Refer to
+This guide assumes that a Hadoop environment exists upon which your provisioning Trafodion. Refer to
<<requirements-hadoop-software,Hadoop Software>> for information about what Hadoop software is required
Trafodion.
@@ -65,7 +65,7 @@ more information about managing Trafodion Database Users.
+
+
Optionally, you can enable Trafodion Security. If you do not enable security in Trafodion, then a client interface
-to Trafodion may request a username and password, but Trafodion ignores the user name and password entered in the
+to Trafodion may request a user name and password, but Trafodion ignores the user name and password entered in the
client interface, and the session runs as the database *root* user, `DB__ROOT`, without restrictions. If you want
to restrict users, restrict access to certain users only, or restrict access to an object or operation, then you must
enable security, which enforces authentication and authorization. Refer to
@@ -85,7 +85,7 @@ is less capable on SUSE than it is on RedHat/CentOS; you have to install the pre
The Trafodion Installer automates many of the tasks required to install/upgrade Trafodion, spanning from downloading and
installing required software packages and making required changes to your Hadoop environment via creating
the Trafodion runtime user ID to installing and starting Trafodion. It is, therefore, highly recommend that
-you use the Trafodion Installer for initial installation and upgrades of Trafodion. These steaps are refered to as
+you use the Trafodion Installer for initial installation and upgrades of Trafodion. These steps are referred to as
"Script-Based Provisioning" in this guide. Refer to <<introduction-trafodion-installer, Trafodion Installer>> provides
usage information.
@@ -103,20 +103,26 @@ Trafodion provisioning is divided into the following main activities:
These activities include tasks such as understanding hardware and operating system requirements,
Hadoop requirements, what software packages that need to be downloaded, configuration settings that need to be changed,
user IDs requirements, and so on.
+
* *<<prepare,Prepare>>*: Activities to prepare the operating system and the Hadoop ecosystem to run
Trafodion. These activities include tasks such as installing required software packages, configure
the Trafodion Installation User, gather information about the Hadoop environment, modify configuration
for different Hadoop services, and so forth.
+
* *<<install,Install>>*: Activities related to installing the Trafodion software. These activities
include tasks such as unpacking the Trafodion tar files, creating the Trafodion Runtime User,
creating Trafodion HDFS directories, installing the Trafodion software, and so forth.
+
+<<<
* *<<upgrade,Upgrade>>*: Activities related to the upgrading the Trafodion software. These activities
include tasks such as shutting down Trafodion, installing a new version of the Trafodion software,
and so on. The upgrade tasks vary depending on the differences between the current and new release of
Trafodion. For example, an upgrade may or may not include an upgrade of the Trafodion metadata.
+
* *<<activate,Activate>>*: Activities related to starting the Trafodion software. These actives
include basic management tasks such as starting and checking the status of the Trafodion components,
performing basic smoke tests, and so forth.
+
* *<<remove,Remove>>*: Activities related to removing Trafodion from your Hadoop cluster.
[[introduction-provisioning-master-node]]
@@ -150,17 +156,18 @@ setup_known_hosts.exp traf_cloudera_mods98 traf_hortonworks_mods
$
```
+<<<
The Trafodion Installer supports two different modes:
1. *Guided Setup*: Prompts for information as it works through the installation/upgrade process. This mode is recommended for new users.
-2. *Expert Install*: Required information is provided in a pre-formatted bash-script configuration file, which is provided
-via a command argument when running the Trafodion Installer thereby surpressing all prompts.
+2. *Automated Setup*: Required information is provided in a pre-formatted bash-script configuration file, which is provided
+via a command argument when running the Trafodion Installer thereby suppressing all prompts.
+
A template of the configuration file is available here within the installer directory: `trafodion_config_default`.
Make a copy of the file in your directory and populate the needed information.
+
-Expert Install is recommended for the expert user and/or for unattended installs.
-Refer to <<introduction-trafodion-expert-setup,Expert Setup>> for information about how to
+Automated Setup is recommended since it allows you to record the required provisioning information information ahead of time.
+Refer to <<introduction-trafodion-automated-setup,Automated Setup>> for information about how to
populate this file.
[[introduction-trafodion-installer-usage]]
@@ -186,6 +193,7 @@ Options:
taken from this file and not prompted for.
```
+<<<
[[introduction-trafodion-installer-install-vs-upgrade]]
=== Install vs. Upgrade
@@ -207,10 +215,10 @@ Refer to the following sections for examples:
* <<install-guided-install, Guided Install>>
* <<upgrade-guided-upgrade, Guided Upgrade>>
-[[introduction-trafodion-installer-expert-setup]]
-=== Expert Setup
+[[introduction-trafodion-installer-automated-setup]]
+=== Automated Setup
-The `--config_file` option runs the Trafodion in Expert Setup mode.
+The `--config_file` option runs the Trafodion in Automated Setup mode.
Before running the Trafodion Installer with this option, you do the following:
@@ -226,7 +234,7 @@ cp trafodion_config_default my_config
<<prepare-gather-configuration-information,Gather Configuration Information>>
section in the <<prepare,Prepare>> chapter.
-3. Run the Trafodion Installer in Expert Setup Mode
+3. Run the Trafodion Installer in Automated Setup Mode
+
*Example*
+
@@ -234,12 +242,16 @@ section in the <<prepare,Prepare>> chapter.
./trafodion_installer --config_file my_config
```
+NOTE: Your Trafodion Configuration File contains the password for the Trafodion Runtime User
+and for the Distribution Manager. Therefore, we recommend that you secure the file in a manner
+that matches the security policies of your organization.
+
==== Example: Creating a Trafodion Configuration File
Using the instructions in <<prepare-gather-configuration-information,Gather Configuration Information>>
in the <<prepare,Prepare>> chapter, you record the following information.
-[cols="15%l,50%,35%",options="header"]
+[cols="30%l,50%,20%",options="header"]
|===
| ID | Information | Setting
| ADMIN | Administrator user name for Apache Ambari or Cloudera Manager. | admin
@@ -254,9 +266,9 @@ in the <<prepare,Prepare>> chapter, you record the following information.
| EPEL_RPM | Location of EPEL RPM. Specify if you don't have access to the Internet. |
| FLOATING_IP | IP address if running DCS in HA mode. |
| HADOOP_TYPE | The type of Hadoop distribution you're installing Trafodion on. | cloudera
-| HBASE_GROUP | Linux group name for the HBASE administative user. | hbase
-| HBASE_USER | Linux user name for the HBASE administative user. | hbase
-| HDFS_USER | Linux user name for the HDFS administative user. | hdfs
+| HBASE_GROUP | Linux group name for the HBASE administrative user. | hbase
+| HBASE_USER | Linux user name for the HBASE administrative user. | hbase
+| HDFS_USER | Linux user name for the HDFS administrative user. | hdfs
| HOME_DIR | Root directory under which the `trafodion` home directory should be created. | /home
| INIT_TRAFODION | Whether to automatically initialize the Trafodion database. | Y
| INTERFACE | Interface type used for $FLOATING_IP. |
@@ -267,7 +279,7 @@ in the <<prepare,Prepare>> chapter, you record the following information.
| LDAP_LEVEL | LDAP Encryption Level. |
| LDAP_PASSWORD | Password for LDAP_USER. |
| LDAP_PORT | Port used to communicate with LDAP Identity Store. |
-| LDAP_SECURITY | Whether to enable simple LDAP authentification. | N
+| LDAP_SECURITY | Whether to enable simple LDAP authentication. | N
| LDAP_USER | LDAP Search user name. |
| LOCAL_WORKDIR | The directory where the Trafodion Installer is located. | /home/centos/trafodion-installer/installer
| MANAGEMENT_ENABLED | Whether your installation uses separate management nodes. | N
@@ -279,7 +291,7 @@ in the <<prepare,Prepare>> chapter, you record the following information.
| START | Whether to start Trafodion after install/upgrade. | Y
| SUSE_LINUX | Whether your installing Trafodion on SUSE Linux. | false
| TRAF_PACKAGE | The location of the Trafodion installation package tar file or core installation tar file. | /home/centos/trafodion-download/apache-trafodion-1.3.0-incubating-bin.tar.gz
-| TRAF_USER | The Trafodion runtim user ID. Must be `trafodion` in this release. | trafodion
+| TRAF_USER | The Trafodion runtime user ID. Must be `trafodion` in this release. | trafodion
| TRAF_USER_PASSWORD | The password used for the `trafodion:trafodion` user ID. | traf123
| URL | FQDN and port for the Distribution Manager's REST API. | trafodion-1.apache.org:7180
|===
@@ -437,8 +449,16 @@ Once completed, run the Trafodion Installer with the `--config_file` option.
Refer to the following sections for examples:
-* <<install-expert-install, Expert Install>>
-* <<upgrade-expert-upgrade, Expert Upgrade>>
+* <<install-automated-install, Automated Install>>
+* <<upgrade-automated-upgrade, Automated Upgrade>>
+
+[[introduction-trafodion-provisioning-directories]]
+== Trafodion Provisioning Directories
+
+Trafodion stores its provisioning information in the following directories on each node in the cluster:
+
+* `/etc/trafodion`: Configurtion information.
+* `/usr/lib/trafodion`: Copies of the installer files.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/b19faadf/docs/provisioning_guide/src/asciidoc/_chapters/prepare.adoc
----------------------------------------------------------------------
diff --git a/docs/provisioning_guide/src/asciidoc/_chapters/prepare.adoc b/docs/provisioning_guide/src/asciidoc/_chapters/prepare.adoc
index 7aa10fa..1ef6c7f 100644
--- a/docs/provisioning_guide/src/asciidoc/_chapters/prepare.adoc
+++ b/docs/provisioning_guide/src/asciidoc/_chapters/prepare.adoc
@@ -93,6 +93,7 @@ ensure that the `requiretty` option is NOT being used.
Please ensure that the <<requirements-os-requirements-and-recommendations,OS Requirements and Recommendations>>
are met for each node in the cluster where you intend to install Trafodion.
+<<<
[[prepare-configure-ldap-identity-store]]
== Configure LDAP Identity Store
@@ -109,7 +110,7 @@ If you wish to manually set up the authentication configuration file and enable
You need to gather/decide information about your environment to aid installation Trafodion, both for the Trafodion Installer
and for recipe-based provisioning. (In alphabetical order to make it easier to find information later on in the provisioning process.)
-[cols="15%l,30%,15%l,40%",options="header"]
+[cols="25%l,25%,15%l,35%",options="header"]
|===
| ID^1^ | Information | Default | Notes
| ADMIN | Administrator user name for Apache Ambari or Cloudera Manager. | admin | A user that can change configuration and restart services via the
@@ -127,9 +128,9 @@ refer to the http://trafodion.apache.org/docs/client_install/index.html[Trafodio
Downloaded automatically by the Trafodion Installer.
| FLOATING_IP | IP address if running DCS in HA mode. | None | Not needed if $ENABLE_HA = N. An FQDN name or IP address.
| HADOOP_TYPE | The type of Hadoop distribution you're installing Trafodion on. | None | Lowercase. cloudera or hadoop.
-| HBASE_GROUP | Linux group name for the HBASE administative user. | hbase | Required in order to provide access to select HDFS directories to this user ID.
-| HBASE_USER | Linux user name for the HBASE administative user. | hbase | Required in order to provide access to select HDFS directories to this user ID.
-| HDFS_USER | Linux user name for the HDFS administative user. | hdfs | The Trafodion Installer uses `sudo su` to make HDFS
+| HBASE_GROUP | Linux group name for the HBASE administrative user. | hbase | Required in order to provide access to select HDFS directories to this user ID.
+| HBASE_USER | Linux user name for the HBASE administrative user. | hbase | Required in order to provide access to select HDFS directories to this user ID.
+| HDFS_USER | Linux user name for the HDFS administrative user. | hdfs | The Trafodion Installer uses `sudo su` to make HDFS
configuration changes under this user.
| HOME_DIR | Root directory under which the `trafodion` home directory should be created. | /home | *Example* +
+
@@ -145,7 +146,7 @@ If the home directory of the `trafodion` user is
| LDAP_LEVEL^2^ | LDAP Encryption Level. | 0 | 0: Encryption not used, 1: SSL, 2: TLS
| LDAP_PASSWORD^2^ | Password for LDAP_USER. | None | If LDAP_USER is required only.
| LDAP_PORT^2^ | Port used to communicate with LDAP Identity Store. | None | Examples: 389 for no encryption or TLS, 636 for SSL.
-| LDAP_SECURITY^2^ | Whether to enable simple LDAP authentification. | N | If Y, then you need to provide LDAP_HOSTS.
+| LDAP_SECURITY^2^ | Whether to enable simple LDAP authentication. | N | If Y, then you need to provide LDAP_HOSTS.
| LDAP_USER^2^ | LDAP Search user name. | None | If required. If so, must provide LDAP_PASSWORD, too.
| LOCAL_WORKDIR | The directory where the Trafodion Installer is located. | None | Full path, no environmental variables.
| MANAGEMENT_ENABLED | Whether your installation uses separate management nodes. | N | Y if using separate management nodes for Apache Ambari or Cloudera Manager.
@@ -157,11 +158,11 @@ distribution manager's REST API.
| REST_BUILD | Tar file containing the REST component. | None | Not needed if using a Trafodion package installation tar file.
| SQ_ROOT | Target directory for the Trafodion software. | $HOME_DIR/trafodion | Trafodion is installed in this directory on all nodes in `$NODE_LIST`.
| START | Whether to start Trafodion after install/upgrade. | N | Does not apply to Recipe-Based Provisioning.
-| SUSE_LINUX | Whether your installing Trafodion on SUSE Linux. | false | Autodetected by the Trafodion Installer.
+| SUSE_LINUX | Whether your installing Trafodion on SUSE Linux. | false | Auto-detected by the Trafodion Installer.
| TRAF_PACKAGE | The location of the Trafodion installation package tar file or core installation tar file. | None | The package file contains the Trafodion server,
DCS, and REST software while the core installation file contains the Trafodion server software only. If you're using a core installation file, then you need to
record the location of the DCS and REST installation tar files, too. Normally, you perform Trafodion provisioning using a Trafodion package installation tar file.
-| TRAF_USER | The Trafodion runtim user ID. | trafodion | Must be `trafodion` in this release.
+| TRAF_USER | The Trafodion runtime user ID. | trafodion | Must be `trafodion` in this release.
| TRAF_USER_PASSWORD | The password used for the `trafodion:trafodion` user ID. | traf123 | Must be 6-8 characters long.
| URL | FQDN and port for the Distribution Manager's REST API. | None | Include `http://` or `https://` as applicable. Specify in the form:
`<IP-address>:<port>` or `<node name>:<port>` Example: `https://susevm-1.yourcompany.local:8080`
@@ -172,6 +173,7 @@ for more information.
2. Refer to <<enable-security,Enable Security>> for more information about these security settings.
+<<<
[[prepare-install-required-software-packages]]
== Install Required Software Packages
@@ -191,6 +193,7 @@ You perform this step as a user with `root` or `sudo` access.
Install the packages listed in <<requirements-software-packages,Software Packages>> above on all nodes in the cluster. Note the special
handling for `log4c++`. See <<prepare-build-and-install-log4cplusplus, Build and Install log4c++>> below for more information.
+<<<
[[prepare-build-and-install-log4cplusplus]]
=== Build and Install log4c++
@@ -238,7 +241,8 @@ sudo yum -y install log4cxx-0.10.0-13.el6.x86_64.rpm
exit
```
-
++
+<<<
3. Verify RPM Installation on Every Node
+
Use the following command to verify that `log4c++` has been installed on every node in the cluster.
@@ -249,7 +253,7 @@ sudo rpm -qa | grep log4cxx
log4cxx-0.10.0-13.el6.x86_64
```
-[[install-download-trafodion-binaries]]
+[[prepare-download-trafodion-binaries]]
== Download Trafodion Binaries
You download the Trafodion binaries from the Trafodion http://trafodion.apache.org/download.html[Download] page.
@@ -263,14 +267,15 @@ http://trafodion.apache.org/docs/client_install/index.html[Trafodion Client Inst
*Example*
+http://apache.cs.utah.edu/incubator/celix/celix-1.0.0.incubating/celix-1.0.0.incubating.tar.gz
+
```
$ mkdir $HOME/trafodion-download
$ cd $HOME/trafodion-download
-$ Download the Trafodion Installer binarier
-$ wget http://traf-builds.esgyn.com/downloads/trafodion/publish/release/1.3.0/apache-trafodion-installer-1.3.0-incubating-bin.tar.gz
---2016-02-14 04:19:40-- http://traf-builds.esgyn.com/downloads/trafodion/publish/release/1.3.0/apache-trafodion-installer-1.3.0-incubating-bin.tar.gz
-Resolving traf-builds.esgyn.com... 52.27.79.56
-Connecting to traf-builds.esgyn.com|52.27.79.56|:80... connected.
+$ Download the Trafodion Installer binaries
+$ wget http://apache.cs.utah.edu/incubator/trafodion/trafodion-1.3.0.incubating/apache-trafodion-installer-1.3.0-incubating-bin.tar.gz
+Resolving http://apache.cs.utah.edu... 192.168.1.56
+Connecting to http://apache.cs.utah.edu|192.168.1.56|:80... connected.
HTTP request sent, awaiting response... 200 OK
Length: 68813 (67K) [application/x-gzip]
Saving to: "apache-trafodion-installer-1.3.0-incubating-bin.tar.gz"
@@ -278,11 +283,15 @@ Saving to: "apache-trafodion-installer-1.3.0-incubating-bin.tar.gz"
100%[=====================================================================================================================>] 68,813 124K/s in 0.5s
2016-02-14 04:19:42 (124 KB/s) - "apache-trafodion-installer-1.3.0-incubating-bin.tar.gz" saved [68813/68813]
+```
+
+<<<
+```
$ # Download the Trafodion Server binaries
-$ wget http://traf-builds.esgyn.com/downloads/trafodion/publish/release/1.3.0/apache-trafodion-1.3.0-incubating-bin.tar.gz
-Resolving traf-builds.esgyn.com... 52.27.79.56
-Connecting to traf-builds.esgyn.com|52.27.79.56|:80... connected.
+$ wget http://apache.cs.utah.edu/incubator/trafodion/trafodion-1.3.0.incubating/apache-trafodion-1.3.0-incubating-bin.tar.gz
+Resolving http://apache.cs.utah.edu... 192.168.1.56
+Connecting to http://apache.cs.utah.edu|192.168.1.56|:80... connected.
HTTP request sent, awaiting response... 200 OK
Length: 214508243 (205M) [application/x-gzip]
Saving to: "apache-trafodion-1.3.0-incubating-bin.tar.gz"
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/b19faadf/docs/provisioning_guide/src/asciidoc/_chapters/recipe_install.adoc
----------------------------------------------------------------------
diff --git a/docs/provisioning_guide/src/asciidoc/_chapters/recipe_install.adoc b/docs/provisioning_guide/src/asciidoc/_chapters/recipe_install.adoc
new file mode 100644
index 0000000..7939ec1
--- /dev/null
+++ b/docs/provisioning_guide/src/asciidoc/_chapters/recipe_install.adoc
@@ -0,0 +1,29 @@
+////
+/**
+* @@@ START COPYRIGHT @@@
+*
+* Licensed to the Apache Software Foundation (ASF) under one
+* or more contributor license agreements. See the NOTICE file
+* distributed with this work for additional information
+* regarding copyright ownership. The ASF licenses this file
+* to you under the Apache License, Version 2.0 (the
+* "License"); you may not use this file except in compliance
+* with the License. You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing,
+* software distributed under the License is distributed on an
+* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+* KIND, either express or implied. See the License for the
+* specific language governing permissions and limitations
+* under the License.
+*
+* @@@ END COPYRIGHT @@@
+ */
+////
+
+[[install-recipe]]
+= Install Recipe
+
+To be written.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/b19faadf/docs/provisioning_guide/src/asciidoc/_chapters/recipe_upgrade.adoc
----------------------------------------------------------------------
diff --git a/docs/provisioning_guide/src/asciidoc/_chapters/recipe_upgrade.adoc b/docs/provisioning_guide/src/asciidoc/_chapters/recipe_upgrade.adoc
new file mode 100644
index 0000000..3efffb2
--- /dev/null
+++ b/docs/provisioning_guide/src/asciidoc/_chapters/recipe_upgrade.adoc
@@ -0,0 +1,30 @@
+////
+/**
+* @@@ START COPYRIGHT @@@
+*
+* Licensed to the Apache Software Foundation (ASF) under one
+* or more contributor license agreements. See the NOTICE file
+* distributed with this work for additional information
+* regarding copyright ownership. The ASF licenses this file
+* to you under the Apache License, Version 2.0 (the
+* "License"); you may not use this file except in compliance
+* with the License. You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing,
+* software distributed under the License is distributed on an
+* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+* KIND, either express or implied. See the License for the
+* specific language governing permissions and limitations
+* under the License.
+*
+* @@@ END COPYRIGHT @@@
+ */
+////
+
+[[upgrade-recipe]]
+= Upgrade Recipe
+
+To be written.
+
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/b19faadf/docs/provisioning_guide/src/asciidoc/_chapters/requirements.adoc
----------------------------------------------------------------------
diff --git a/docs/provisioning_guide/src/asciidoc/_chapters/requirements.adoc b/docs/provisioning_guide/src/asciidoc/_chapters/requirements.adoc
index ef85ec5..c33717f 100644
--- a/docs/provisioning_guide/src/asciidoc/_chapters/requirements.adoc
+++ b/docs/provisioning_guide/src/asciidoc/_chapters/requirements.adoc
@@ -59,6 +59,7 @@ Typically, memory configuration range between 64-128 GB per node with minimum re
The cluster size can span from 1 to _n_ nodes; a minimum of two nodes is recommended.
A minimum of two cores is required regardless of whether you're deploying Trafodion on a bare-metal or virtual environment.
+<<<
Recommended configurations:
[cols="40%h,60%a",options="header"]
@@ -200,7 +201,8 @@ for installation. You need to build and install `log4c++` manually.
[cols="20%,45%,35%l",options="header"]
|===
| Package | Usage | Installation
-| EPEL | Add-on packages to completed the Linux distribution. | http://download.fedoraproject.org/pub/epel/6/x86_64/epel-release-6-8.noarch[Fedora RPM]
+| EPEL | Add-on packages to completed the Linux distribution. | Download
+http://download.fedoraproject.org/pub/epel/6/x86_64/epel-release-6-8.noarch[Fedora RPM]
| pdsh | Parallelize shell commands during install and Trafodion runtime utilities. | yum install pdsh
| log4cxx | Message logging. | Manual process^1^
| sqlite | Internal configuration information managed by the Trafodion Foundation component. | yum install sqlite
@@ -335,6 +337,7 @@ trafodion soft nofile 8192
trafodion hard nofile 65535
```
+<<<
[[requirements-zookeeper-changes]]
=== ZooKeeper Changes
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/b19faadf/docs/provisioning_guide/src/asciidoc/_chapters/script_install.adoc
----------------------------------------------------------------------
diff --git a/docs/provisioning_guide/src/asciidoc/_chapters/script_install.adoc b/docs/provisioning_guide/src/asciidoc/_chapters/script_install.adoc
index 4454e2b..ae563a3 100644
--- a/docs/provisioning_guide/src/asciidoc/_chapters/script_install.adoc
+++ b/docs/provisioning_guide/src/asciidoc/_chapters/script_install.adoc
@@ -27,11 +27,216 @@
= Install
This chapter describes how to use the Trafodion Installer to install Trafodion. You use the Trafodion Provisioning ID
-to run the Trafodon Installer.
+to run the Trafodion Installer.
NOTE: You *must* install log4c++ on all nodes in the cluster prior to running the Trafodion Installer. Refer
to <<prepare-build-and-install-log4cplusplus,Build and Install log4c++>> for instructions.
+[[install-unpack-installer]]
+== Unpack Installer
+
+You should already have downloaded the Trafodion Binaries per the instructions in the
+<<prepare-download-trafodion-binaries,Download Trafodion Binaries>> in the <<prepare,Prepare>>
+chapter. If not, please do so now.
+
+The first step in the installation process is to unpack the Trafodion Installer tar file.
+
+*Example*
+
+```
+$ mkdir $HOME/trafodion-installer
+$ cd $HOME/trafodion-downloads
+$ tar -zxf apache-trafodion-installer-1.3.0-incubating-bin.tar.gz -C $HOME/trafodion-installer
+$ ls $HOME/trafodion-installer/installer
+bashrc_default tools traf_config_check trafodion_apache_hadoop_install traf_package_setup
+build-version-1.3.0.txt traf_add_user traf_config_setup trafodion_config_default traf_setup
+dcs_installer traf_apache_hadoop_config_setup traf_create_systemdefaults trafodion_install traf_sqconfig
+rest_installer traf_authentication_conf_default traf_getHadoopNodes trafodion_license traf_start
+setup_known_hosts.exp traf_cloudera_mods98 traf_hortonworks_mods98 trafodion_uninstaller
+$
+```
+
+[[install-automated-install]]
+== Automated Install
+
+The `--config_file` option runs the Trafodion in Automated Setup mode. Refer to <<introduction-trafodion-installer,Trafodion Installer>>
+in the <<introduction,Introduction>> chapter for instructions of how you edit your configuration file.
+
+Edit your config file using the information you collected in the <<prepare-gather-configuration-information,Gather Configuration Information>>
+in the <<prepare,Prepare>> chapter.
+
+The following example shows an automated install of Trafodion on a two-node Hortonworks Hadoop cluster.
+
+NOTE: By default, the Trafodion Installer invokes `sqlci` so that you can enter the `initialize trafodion;` command.
+This is shown in the example below.
+
+*Example*
+
+1. Run the Trafodion Installer in Automated Setup mode.
++
+```
+$ cd $HOME/trafodion-installer/installer
+$ ./trafodion_install --config_file my
+******************************
+ TRAFODION INSTALLATION START
+******************************
+
+***INFO: testing sudo access
+***INFO: Log file located at /var/log/trafodion/trafodion_install_2016-02-16-21-12-03.log
+***INFO: Config directory: /etc/trafodion
+***INFO: Working directory: /usr/lib/trafodion
+
+************************************
+ Trafodion Configuration File Check
+************************************
+
+
+***INFO: Testing sudo access on node trafodion-1
+***INFO: Testing sudo access on node trafodion-2
+***INFO: Testing ssh on trafodion-1
+***INFO: Testing ssh on trafodion-2
+***INFO: Getting list of all hortonworks nodes
+***INFO: Getting list of all hortonworks nodes
+***INFO: hortonworks list of nodes: trafodion-1 trafodion-2
+***INFO: Testing ssh on trafodion-1
+***INFO: Testing ssh on trafodion-2
+***INFO: Testing sudo access on trafodion-1
+***INFO: Testing sudo access on trafodion-2
+***DEBUG: trafodionFullName=trafodion_server-1.3.0.tgz
+***INFO: Trafodion version = 1.3.0
+***DEBUG: HBase's java_exec=/usr/jdk64/jdk1.7.0_67/bin/java
+
+******************************
+ TRAFODION SETUP
+******************************
+
+***INFO: Starting Trafodion environment setup (2016-02-16-21-12-31)
+=== 2016-02-16-21-12-31 ===
+# @@@ START COPYRIGHT @@@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+.
+.
+.
+9. Accepting Warranty or Additional Liability. While redistributing
+the Work or Derivative Works thereof, You may choose to offer, and
+charge a fee for, acceptance of support, warranty, indemnity, or
+other liability obligations and/or rights consistent with this
+License. However, in accepting such obligations, You may act only
+on Your own behalf and on Your sole responsibility, not on behalf
+of any other Contributor, and only if You agree to indemnify, defend,
+and hold each Contributor harmless for any liability incurred by,
+or claims asserted against, such Contributor by reason of your
+accepting any such warranty or additional liability.
+
+END OF TERMS AND CONDITIONS
+
+BY TYPING "ACCEPT" YOU AGREE TO THE TERMS OF THIS AGREEMENT: ***INFO: testing sudo access
+***INFO: Checking all nodes in specified node list
+trafodion-1
+trafodion-2
+***INFO: Total number of nodes = 2
+***INFO: Starting Trafodion Package Setup (2016-02-16-21-12-35)
+***INFO: Installing required packages
+***INFO: Log file located in /var/log/trafodion
+***INFO: ... EPEL rpm
+***INFO: ... pdsh on node trafodion-1
+***INFO: ... pdsh on node trafodion-2
+***INFO: Checking if log4cxx is installed ...
+***INFO: Checking if sqlite is installed ...
+***INFO: Checking if expect is installed ...
+.
+.
+.
+***INFO: trafodion user added successfully
+***INFO: Trafodion environment setup completed
+***INFO: creating sqconfig file
+***INFO: Reserving DCS ports
+
+******************************
+ TRAFODION MODS
+******************************
+
+***INFO: Hortonworks installed will run traf_hortonworks_mods98
+***INFO: Detected JAVA version 1.7
+***INFO: copying hbase-trx-hdp2_2-1.3.0.jar to all nodes
+PORT=:8080
+########## Performing 'set' hbase.master.distributed.log.splitting:false on (Site:hbase-site, Tag:version1)
+########## PUTting json into: doSet_version1455657199513777160.json
+.
+.
+.
+Starting the REST environment now
+starting rest, logging to /home/trafodion/apache-trafodion-1.3.0-incubating-bin/rest-1.3.0/bin/../logs/rest-trafodion-1-rest-trafodion-1.out
+SLF4J: Class path contains multiple SLF4J bindings.
+SLF4J: Found binding in [jar:file:/home/trafodion/apache-trafodion-1.3.0-incubating-bin/rest-1.3.0/lib/slf4j-log4j12-1.7.5.jar!/org/slf4j/impl/StaticLoggerBinder.class]
+SLF4J: Found binding in [jar:file:/usr/hdp/2.2.9.0-3393/hadoop/lib/slf4j-log4j12-1.7.5.jar!/org/slf4j/impl/StaticLoggerBinder.class]
+SLF4J: See http://www.slf4j.org/codes.html#multiple_bindings for an explanation.
+SLF4J: Actual binding is of type [org.slf4j.impl.Log4jLoggerFactory]
+
+
+DcsMaster is not started. Please start DCS using 'dcsstart' command...
+
+Process Configured Actual Down
+--------- ---------- ------ ----
+DcsMaster 1 0 1
+DcsServer 2 0 2
+mxosrvr 8 8
+
+
+You can monitor the SQ shell log file : /home/trafodion/apache-trafodion-1.3.0-incubating-bin/logs/sqmon.log
+
+
+Startup time 0 hour(s) 1 minute(s) 9 second(s)
+Apache Trafodion Conversational Interface 1.3.0
+Copyright (c) 2015 Apache Software Foundation
+>> initialize trafodion;
+--- SQL operation complete.
+>>
+
+End of MXCI Session
+
+***INFO: Installation completed successfully.
+
+*********************************
+ TRAFODION INSTALLATION COMPLETE
+*********************************
+
+$
+```
+
+2. Switch to the Trafodion Runtime User and check the status of Trafodion.
++
+*Example*
++
+```
+$ sudo su - trafodion
+$ sqcheck
+Checking if processes are up.
+Checking attempt: 1; user specified max: 2. Execution time in seconds: 0.
+
+The SQ environment is up!
+
+
+Process Configured Actual Down
+------- ---------- ------ ----
+DTM 2 2
+RMS 4 4
+MXOSRVR 8 8
+
+$
+```
+
+Trafodion is now running on your Hadoop cluster. Please refer to the <<activate,Activate>> chapter for
+basic instructions on how to verify the Trafodion management and how to perform basic management
+operations.
+
[[install-guided-install]]
== Guided Install
@@ -40,7 +245,7 @@ The Trafodion Installer prompts you for the information you collected in the
The following example shows a guided install of Trafodion on a two-node Cloudera Hadoop cluster.
-NOTE: By default, the Trafodion Installer invokes `sqlci` so that you can enter the `initialize tradodion;` command.
+NOTE: By default, the Trafodion Installer invokes `sqlci` so that you can enter the `initialize trafodion;` command.
This is shown in the example below.
*Example*
@@ -198,32 +403,6 @@ trafodion-2
.
.
.
-{
- "id" : 76,
- "name" : "Restart",
- "startTime" : "2016-02-15T07:12:48.511Z",
- "active" : true,
- "children" : {
- "items" : [ {
- "id" : 77,
- "name" : "Stop",
- "startTime" : "2016-02-15T07:12:48.575Z",
- "endTime" : "2016-02-15T07:13:17.139Z",
- "active" : false,
- "success" : true,
- "resultMessage" : "All services successfully stopped."
- }, {
- "id" : 100,
- "name" : "Start",
- "startTime" : "2016-02-15T07:13:17.157Z",
- "active" : true
- } ]
- }
-}***INFO: ...polling every 30 seconds until restart is completed.
- "resultMessage" : "All services successfully started."
- } ]
- }
-}***INFO: ...polling every 30 seconds until restart is completed.
***INFO: Hadoop restart completed successfully
***INFO: waiting for HDFS to exit safemode
Safe mode is OFF
@@ -302,123 +481,12 @@ End of MXCI Session
*********************************
TRAFODION INSTALLATION COMPLETE
*********************************
-```
-
-2. switch to the Trafodion Runtime User and check the status of Trafodion.
-+
-```
-$ sudo su - trafodion
-$ sqcheck
-Checking if processes are up.
-Checking attempt: 1; user specified max: 2. Execution time in seconds: 0.
-
-The SQ environment is up!
-
-
-Process Configured Actual Down
-------- ---------- ------ ----
-DTM 2 2
-RMS 4 4
-MXOSRVR 8 8
$
```
-Trafodion is now running on your Hadoop cluster. Please refer to the <<activate,Activate>> chapter for
-basic instructions on how to verify the Trafodion management and how to perform basic management
-operations.
-
-[[install-expert-install]]
-=== Expert Install
-
-The `--config_file` option runs the Trafodion in Expert Setup mode. Refer to <<introduction-trafodion-installer,Trafodion Installer>>
-in the <<introduction,Introduction>> chapter for instructions of how you edit your configuration file.
-
-Edit your config file using the information you collected in the <<prepare-gather-configuration-information,Gather Configuration Information>>
-in the <<prepare,Prepare>> chapter.
-
-The following example shows a guided install of Trafodion on a two-node Cloudera Hadoop cluster.
-
-NOTE: By default, the Trafodion Installer invokes `sqlci` so that you can enter the `initialize tradodion;` command.
-This is shown in the example below.
-
-*Example*
-
-1. Run the Trafodion Installer in expert mode.
-+
-```
-$ ./trafodion_installer --config_file my_config
-******************************
- TRAFODION INSTALLATION START
-******************************
-
-***INFO: testing sudo access
-***INFO: Log file located at /var/log/trafodion/trafodion_install_2016-02-15-08-00-59.log
-***INFO: Config directory: /etc/trafodion
-***INFO: Working directory: /usr/lib/trafodion
-
-************************************
- Trafodion Configuration File Check
-************************************
-
-
-***INFO: Testing sudo access on node trafodion-1
-***INFO: Testing sudo access on node trafodion-2
-***INFO: Testing ssh on trafodion-1
-***INFO: Testing ssh on trafodion-2
-.
-.
-.
-9. Accepting Warranty or Additional Liability. While redistributing
-the Work or Derivative Works thereof, You may choose to offer, and
-charge a fee for, acceptance of support, warranty, indemnity, or
-other liability obligations and/or rights consistent with this
-License. However, in accepting such obligations, You may act only
-on Your own behalf and on Your sole responsibility, not on behalf
-of any other Contributor, and only if You agree to indemnify, defend,
-and hold each Contributor harmless for any liability incurred by,
-or claims asserted against, such Contributor by reason of your
-accepting any such warranty or additional liability.
-
-END OF TERMS AND CONDITIONS
-
-BY TYPING "ACCEPT" YOU AGREE TO THE TERMS OF THIS AGREEMENT:ACCEPT
-***INFO: testing sudo access
-***INFO: Checking all nodes in specified node list
-trafodion-1
-trafodion-2
-***INFO: Total number of nodes = 2
-***INFO: Starting Trafodion Package Setup (2016-02-15-08-02-42)
-***INFO: Installing required packages
-***INFO: Log file located in /var/log/trafodion
-***INFO: ... pdsh on node trafodion-1
-***INFO: ... pdsh on node trafodion-2
-***INFO: Checking if log4cxx is installed ...
-.
-.
-.
-Version Check: done
-
-Metadata Upgrade: done
-
-
---- SQL operation complete.
->>
-
-End of MXCI Session
-
-***INFO: Installation completed successfully.
-
-*********************************
- TRAFODION INSTALLATION COMPLETE
-*********************************
-$
-```
-
2. Switch to the Trafodion Runtime User and check the status of Trafodion.
+
-*Example*
-+
```
$ sudo su - trafodion
$ sqcheck
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/b19faadf/docs/provisioning_guide/src/asciidoc/_chapters/script_remove.adoc
----------------------------------------------------------------------
diff --git a/docs/provisioning_guide/src/asciidoc/_chapters/script_remove.adoc b/docs/provisioning_guide/src/asciidoc/_chapters/script_remove.adoc
index 71b4d24..275592d 100644
--- a/docs/provisioning_guide/src/asciidoc/_chapters/script_remove.adoc
+++ b/docs/provisioning_guide/src/asciidoc/_chapters/script_remove.adoc
@@ -28,23 +28,23 @@
You use the Trafodion Provisioning User for these instructions.
NOTE: You do not need to use the `trafodion_uninstaller` script if upgrading Trafodion. Instead, use the `trafodion_install` script,
-which automatically upgrades the version of Trafodion. Please refer to the <<installl,Install>> chapter for further instructions.
+which automatically upgrades the version of Trafodion. Please refer to the <<install,Install>> chapter for further instructions.
Run the commands from the first node of the cluster. Do not run them from a machine that is not part of the Trafodion cluster.
-1. Stop Trafodion
-+
+== Stop Trafodion
+
Do the following:
-+
+
```
su trafodion
cd $MY_SQROOT/sql/scripts or cds
sqstop
exit
```
-+
+
*Example*
-+
+
```
[admin@trafodion-1 ~]$ su trafodion
[trafodion@trafodion-1 scripts]$ cds
@@ -63,6 +63,11 @@ Processing cluster.conf on local host trafodion-1
.
.
.
+```
+
+<<<
+
+```
[$Z000HDS] 001,00024772 001 GEN ES--A-- $Z010K7S NONE mxosrvr
[$Z000HDS] 001,00024782 001 GEN ES--U-- $ZLOBSRV1 NONE mxlobsrvr
shutdown
@@ -79,11 +84,12 @@ Mon Feb 15 07:49:26 UTC 2016
[admin@trafodion-1 ~]$
```
-2. Run `trafodion_uninstaller`
-+
+== Run `trafodion_uninstaller`
+
The `trafodion_uninstaller` completely removes Trafodion.
+
*Example*
-+
+
```
[admin@trafodion-1 ~]$ cd $HOME/trafodion-installer/installer
[admin@trafodion-1 installer]$ ./trafodion_uninstaller
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/b19faadf/docs/provisioning_guide/src/asciidoc/_chapters/script_upgrade.adoc
----------------------------------------------------------------------
diff --git a/docs/provisioning_guide/src/asciidoc/_chapters/script_upgrade.adoc b/docs/provisioning_guide/src/asciidoc/_chapters/script_upgrade.adoc
index 2bcff5b..0d27a08 100644
--- a/docs/provisioning_guide/src/asciidoc/_chapters/script_upgrade.adoc
+++ b/docs/provisioning_guide/src/asciidoc/_chapters/script_upgrade.adoc
@@ -27,30 +27,416 @@
= Upgrade
This chapter describes how to use the Trafodion Installer to upgrade Trafodion. You use the Trafodion Provisioning ID
-to run the Trafodon Installer.
+to run the Trafodion Installer.
+[[upgraded-download-updated-trafodion-binaries]]
+== Download Updated Trafodion Binaries
+
+You perform this step as the Trafodion Provisioning User.
+
+You download the updated Trafodion binaries from the Trafodion http://trafodion.apache.org/download.html[Download] page.
+Download the following packages:
+
+* Trafodion Installer (if planning to use the Trafodion Installer)
+* Trafodion Server
+
+Refer to <<prepare-download-trafodion-binaries, Download Trafodion Binaries>> in the <<prepare,Prepare>> chapter for examples.
+
+
+[[upgrade-unpack-installer]]
+== Unpack Installer
+
+You perform this step as the Trafodion Provisioning User.
+
+You unpack the updated Trafodion Installer into a new directory.
+
+*Example*
+
+```
+$ mkdir $HOME/trafodion-installer-2.0
+$ cd $HOME/trafodion-downloads
+$ tar -zxf apache-trafodion-installer-2.0.0-incubating-bin.tar.gz -C $HOME/trafodion-installer
+$ ls $HOME/trafodion-installer/installer-2.0
+bashrc_default tools traf_config_check trafodion_apache_hadoop_install traf_package_setup
+build-version-2.0.0.txt traf_add_user traf_config_setup trafodion_config_default traf_setup
+dcs_installer traf_apache_hadoop_config_setup traf_create_systemdefaults trafodion_install traf_sqconfig
+rest_installer traf_authentication_conf_default traf_getHadoopNodes trafodion_license traf_start
+setup_known_hosts.exp traf_cloudera_mods98 traf_hortonworks_mods98 trafodion_uninstaller
+$
+```
+
+[[upgrade-stop-tradodion]]
+== Stop Trafodion
+You perform this step as the Trafodion Runtime User.
+
+*Example*
+
+```
+$ sudo su trafodion
+$ sqstop
+Shutting down the REST environment now
+stopping rest.
+Shutting down the DCS environment now
+stopping master.
+trafodion-1: stopping server.
+trafodion-2: stopping server.
+stopped $zlobsrv0
+stopped $zlobsrv1
+Shutting down (normal) the SQ environment!
+Wed Feb 17 05:12:40 UTC 2016
+Processing cluster.conf on local host trafodion-1
+[$Z000KAE] Shell/shell Version 1.0.1 Apache_Trafodion Release 1.3.0 (Build release [1.3.0-0-g5af956f_Bld2], date 20160112_1927)
+ps
+```
+
+<<<
+
+```
+[$Z000KAE] %ps
+[$Z000KAE] NID,PID(os) PRI TYPE STATES NAME PARENT PROGRAM
+[$Z000KAE] ------------ --- ---- ------- ----------- ----------- ---------------
+[$Z000KAE] 000,00064198 000 WDG ES--A-- $WDG000 NONE sqwatchdog
+[$Z000KAE] 000,00064199 000 PSD ES--A-- $PSD000 NONE pstartd
+[$Z000KAE] 000,00064212 001 GEN ES--A-- $TSID0 NONE idtmsrv
+[$Z000KAE] 000,00064242 001 DTM ES--A-- $TM0 NONE tm
+[$Z000KAE] 000,00065278 001 GEN ES--A-- $ZSC000 NONE mxsscp
+[$Z000KAE] 000,00065305 001 SSMP ES--A-- $ZSM000 NONE mxssmp
+[$Z000KAE] 000,00001219 001 GEN ES--A-- $Z0000ZU NONE mxosrvr
+[$Z000KAE] 000,00001235 001 GEN ES--A-- $Z00010A NONE mxosrvr
+[$Z000KAE] 000,00001279 001 GEN ES--A-- $Z00011J NONE mxosrvr
+[$Z000KAE] 000,00001446 001 GEN ES--A-- $Z00016B NONE mxosrvr
+[$Z000KAE] 000,00024864 001 GEN ES--A-- $Z000KAE NONE shell
+[$Z000KAE] 001,00025180 000 PSD ES--A-- $PSD001 NONE pstartd
+[$Z000KAE] 001,00025179 000 WDG ES--A-- $WDG001 NONE sqwatchdog
+[$Z000KAE] 001,00025234 001 DTM ES--A-- $TM1 NONE tm
+[$Z000KAE] 001,00025793 001 GEN ES--A-- $ZSC001 NONE mxsscp
+[$Z000KAE] 001,00025797 001 SSMP ES--A-- $ZSM001 NONE mxssmp
+[$Z000KAE] 001,00026587 001 GEN ES--A-- $Z010LPM NONE mxosrvr
+[$Z000KAE] 001,00026617 001 GEN ES--A-- $Z010LQH NONE mxosrvr
+[$Z000KAE] 001,00026643 001 GEN ES--A-- $Z010LR8 NONE mxosrvr
+[$Z000KAE] 001,00026644 001 GEN ES--A-- $Z010LR9 NONE mxosrvr
+shutdown
+[$Z000KAE] %shutdown
+exit
+Issued a 'shutdown normal' request
+
+Shutdown in progress
+
+# of SQ processes: 0
+SQ Shutdown (normal) from /home/trafodion Successful
+Wed Feb 17 05:12:47 UTC 2016
+$
+```
+
+<<<
+[[upgrade-automated-upgrade]]
+== Automated Upgrade
+
+You perform this step as the Trafodion Provisioning User.
+
+The `--config_file` option runs the Trafodion in Automated Setup mode. Refer to <<introduction-trafodion-installer,Trafodion Installer>>
+in the <<introduction,Introduction>> chapter for instructions of how you edit your configuration file.
+
+At a minimum, you need to change the following settings:
+
+* `LOCAL_WORKDIR`
+* `TRAF_PACKAGE`
+* `SQ_ROOT`
+
+*Example*
+
+```
+$ cd $HOME/trafodion-configuration
+$ cp my_config my_config_2.0
+$ # Pre edit content
+
+export LOCAL_WORKDIR="/home/centos/trafodion-installer/installer"
+export TRAF_PACKAGE="/home/centos/trafodion-download/apache-trafodion-1.3.0-incubating-bin.tar.gz"
+export SQ_ROOT="/home/trafodion/apache-trafodion-1.3.0-incubating-bin"
+
+$ # Use your favorit editor to modify my_config_2.0
+$ emacs my_config_2.0
+$ # Post edit changes
+
+export LOCAL_WORKDIR="/home/centos/trafodion-installer-2.0/installer"
+export TRAF_PACKAGE="/home/centos/trafodion-download/apache-trafodion-2.0.0-incubating-bin.tar.gz"
+export SQ_ROOT="/home/trafodion/apache-trafodion-2.0.0-incubating-bin"
+```
+
+The following example shows an upgrade of Trafodion on a two-node Hortonworks Hadoop cluster using
+Automated Setup mode.
+
+NOTE: The Trafodion Installer performs the same configuration changes as it does for an installation,
+including restarting Hadoop services.
+
+*Example*
+
+1. Run the updated Trafodion Installer using the modified my_config_2.0 file.
++
+```
+$ cd $HOME/trafodion-installer-2.0/installer
+$ ./trafodion_install --config_file $HOME/trafodion-configuration/my_config_2.0
+******************************
+ TRAFODION INSTALLATION START
+******************************
+
+***INFO: Testing sudo access on node trafodion-1
+***INFO: Testing sudo access on node trafodion-2
+***INFO: Testing ssh on trafodion-1
+***INFO: Testing ssh on trafodion-2
+***INFO: Getting list of all hortonworks nodes
+***INFO: Getting list of all hortonworks nodes
+***INFO: hortonworks list of nodes: trafodion-1 trafodion-2
+***INFO: Testing ssh on trafodion-1
+***INFO: Testing ssh on trafodion-2
+***INFO: Testing sudo access on trafodion-1
+***INFO: Testing sudo access on trafodion-2
+***INFO: Trafodion scanner will not be run.
+***DEBUG: trafodionFullName=trafodion_server-2.0.0.tgz
+***INFO: Trafodion version = 2.0.0
+***DEBUG: HBase's java_exec=/usr/jdk64/jdk1.7.0_67/bin/java
+
+******************************
+ TRAFODION SETUP
+******************************
+
+***INFO: Installing required RPM packages
+***INFO: Starting Trafodion Package Setup (2016-02-17-05-33-29)
+***INFO: Installing required packages
+***INFO: Log file located in /var/log/trafodion
+***INFO: ... pdsh on node trafodion-1
+***INFO: ... pdsh on node trafodion-2
+***INFO: Checking if log4cxx is installed ...
+.
+.
+.
+DcsMaster is not started. Please start DCS using 'dcsstart' command...
+
+Process Configured Actual Down
+--------- ---------- ------ ----
+DcsMaster 1 0 1
+DcsServer 2 0 2
+mxosrvr 8 8
+
+
+You can monitor the SQ shell log file : /home/trafodion/apache-trafodion-2.0.0-incubating-bin/logs/sqmon.log
+
+
+Startup time 0 hour(s) 1 minute(s) 9 second(s)
+Apache Trafodion Conversational Interface 1.3.0
+Copyright (c) 2015 Apache Software Foundation
+>>Metadata Upgrade: started
+
+Version Check: started
+ Metadata is already at Version 1.1.
+Version Check: done
+
+Metadata Upgrade: done
+
+
+--- SQL operation complete.
+>>
+
+End of MXCI Session
+
+***INFO: Installation completed successfully.
+
+*********************************
+ TRAFODION INSTALLATION COMPLETE
+*********************************
+
+$
+```
+
+2. Switch to the Trafodion Runtime User and check the status of Trafodion.
++
+```
+$ sudo su - trafodion
+$ sqcheck
+Checking if processes are up.
+Checking attempt: 1; user specified max: 2. Execution time in seconds: 0.
+
+The SQ environment is up!
+
+
+Process Configured Actual Down
+------- ---------- ------ ----
+DTM 2 2
+RMS 4 4
+MXOSRVR 8 8
+
+$
+```
+
+Trafodion is now running on your Hadoop cluster. Please refer to the <<activate,Activate>> chapter for
+basic instructions on how to verify the Trafodion management and how to perform basic management
+operations.
+
+<<<
[[upgrade-guided-upgrade]]
== Guided Upgrade
-The Trafodion Installer prompts you for the information you collected in the
+You perform this step as the Trafodion Provisioning User.
+
+As in the case with an installation, the Trafodion Installer prompts you for the information you collected in the
<<prepare-gather-configuration-information, Gather Configuration Information>> step in the <<prepare,Prepare>> chapter.
+Some of the prompts are populated with the current values.
+
+export LOCAL_WORKDIR="/home/centos/trafodion-installer/installer"
+export TRAF_PACKAGE="/home/centos/trafodion-download/apache-trafodion-1.3.0-incubating-bin.tar.gz"
+export SQ_ROOT="/home/trafodion/apache-trafodion-1.3.0-incubating-bin"
+
The following example shows a guided upgrade of Trafodion on a two-node Cloudera Hadoop cluster.
-*To be written.*
+*Example*
-[[upgrade-expert-upgrade]]
-=== Expert Upgrade
+1. Run the updated Trafodion Installer in Guided Setup mode to perform the upgrade. Change information
+at prompts as applicable.
++
+```
+$ cd $HOME/trafodion-installer-2.0/installer
+$ ./trafodion_install
+******************************
+ TRAFODION INSTALLATION START
+******************************
+
+***INFO: testing sudo access
+***INFO: Log file located at /var/log/trafodion/trafodion_install_2016-02-17-08-15-33.log
+***INFO: Config directory: /etc/trafodion
+***INFO: Working directory: /usr/lib/trafodion
+
+*******************************
+ Trafodion Configuration Setup
+*******************************
+
+***INFO: Please press [Enter] to select defaults.
+
+Enter trafodion password, default is [traf123]:
+Enter list of nodes (blank separated), default []: trafodion-1.apache.org trafodion-2.apache.org
+Specify location of Java 1.7.0_65 or higher (JDK), default is [/usr/java/jdk1.7.0_67-cloudera]:
+Enter full path (including .tar or .tar.gz) of trafodion tar file []: /home/centos/trafodion-download/apache-trafodion-2.0.0-incubating-bin.tar.gz
+Enter Hadoop admin username, default is [admin]:
+Enter Hadoop admin password, default is [admin]:
+Enter Hadoop external network URL:port (no 'http://' needed), default is []: trafodion-1.apache.org:7180
+Enter HDFS username, default is [hdfs]:
+Enter HBase username, default is [hbase]:
+Enter HBase group, default is [hbase]:
+Enter directory to install trafodion to, default is [/home/trafodion/apache-trafodion-1.3.0-incubating-bin]: /home/centos/apache-trafodion-2.0.0-incubating-bin
+Start Trafodion after install (Y/N), default is Y:
+Total number of client connections per node, default [16]: 8
+Enable simple LDAP security (Y/N), default is N:
+***INFO: Configuration file: /etc/trafodion/trafodion_config
+***INFO: Trafodion configuration setup complete
+
+************************************
+ Trafodion Configuration File Check
+************************************
+
+
+***INFO: Testing sudo access on node trafodion-1
+***INFO: Testing sudo access on node trafodion-2
+***INFO: Testing ssh on trafodion-1
+***INFO: Testing ssh on trafodion-2
+***INFO: Getting list of all cloudera nodes
+***INFO: Getting list of all cloudera nodes
+***INFO: cloudera list of nodes: trafodion-1 trafodion-2
+***INFO: Testing ssh on trafodion-1
+***INFO: Testing ssh on trafodion-2
+***INFO: Testing sudo access on trafodion-1
+***INFO: Testing sudo access on trafodion-2
+***INFO: Checking cloudera Version
+***INFO: nameOfVersion=cdh5.3.0
+***INFO: HADOOP_PATH=/usr/lib/hbase/lib
+***INFO: Trafodion scanner will not be run.
+***DEBUG: trafodionFullName=trafodion_server-1.3.0.tgz
+***INFO: Trafodion version = 1.3.0
+***DEBUG: HBase's java_exec=/usr/java/jdk1.7.0_67-cloudera/bin/java
+
+******************************
+ TRAFODION SETUP
+******************************
+
+***INFO: Installing required RPM packages
+***INFO: Starting Trafodion Package Setup (2016-02-17-08-16-11)
+***INFO: Installing required packages
+***INFO: Log file located in /var/log/trafodion
+***INFO: ... pdsh on node trafodion-1
+***INFO: ... pdsh on node trafodion-2
+***INFO: Checking if log4cxx is installed ...
+***INFO: Checking if sqlite is installed ...
+***INFO: Checking if expect is installed ...
+***INFO: Checking if perl-DBD-SQLite* is installed ...
+***INFO: Checking if protobuf is installed ...
+***INFO: Checking if xerces-c is installed ...
+***INFO: Checking if perl-Params-Validate is installed ...
+***INFO: Checking if perl-Time-HiRes is installed ...
+***INFO: Checking if gzip is installed ...
+***INFO: creating sqconfig file
+***INFO: Reserving DCS ports
+
+******************************
+ TRAFODION MODS
+******************************
+
+***INFO: Cloudera installed will run traf_cloudera_mods98
+***INFO: Detected JAVA version 1.7
+***INFO: copying hbase-trx-cdh5_3-1.3.0.jar to all nodes
+***INFO: Cloudera Manager is on trafodion-1
+.
+.
+.
+Zookeeper is listening on port 2181
+DcsMaster is listening on port 23400
+
+Process Configured Actual Down
+--------- ---------- ------ ----
+DcsMaster 1 1
+DcsServer 2 2
+mxosrvr 8 8
+
+
+You can monitor the SQ shell log file : /home/trafodion/apache-trafodion-2.0.0-incubating-bin/logs/sqmon.log
+
+
+Startup time 0 hour(s) 1 minute(s) 9 second(s)
+Apache Trafodion Conversational Interface 1.3.0
+Copyright (c) 2015 Apache Software Foundation
+>>
+
+End of MXCI Session
+
+***INFO: Installation completed successfully.
+
+*********************************
+ TRAFODION INSTALLATION COMPLETE
+*********************************
+
+$
+```
+
+2. Switch to the Trafodion Runtime User and check the status of Trafodion.
++
+```
+$ sudo su - trafodion
+$ sqcheck
+Checking if processes are up.
+Checking attempt: 1; user specified max: 2. Execution time in seconds: 0.
+
+The SQ environment is up!
-The `--config_file` option runs the Trafodion in Expert Setup mode. Refer to <<introduction-trafodion-installer,Trafodion Installer>>
-in the <<introduction,Introduction>> chapter for instructions of how you edit your configuration file.
-TODO: Do you perform an upgrade when the Hadoop configuration changes?
+Process Configured Actual Down
+------- ---------- ------ ----
+DTM 2 2
+RMS 4 4
+MXOSRVR 8 8
-If needed (TODO: when?), edit your config file using the information you collected in the <<prepare-gather-configuration-information,Gather Configuration Information>>
-in the <<prepare,Prepare>> chapter.
+$
+```
-The following example shows a guided install of Trafodion on a two-node Cloudera Hadoop cluster.
+Trafodion is now running on your Hadoop cluster. Please refer to the <<activate,Activate>> chapter for
+basic instructions on how to verify the Trafodion management and how to perform basic management
+operations.
-*To be written.*
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/b19faadf/docs/shared/trafodion-manuals.css
----------------------------------------------------------------------
diff --git a/docs/shared/trafodion-manuals.css b/docs/shared/trafodion-manuals.css
index 4023728..80e72cb 100644
--- a/docs/shared/trafodion-manuals.css
+++ b/docs/shared/trafodion-manuals.css
@@ -184,7 +184,7 @@ body.toc2{padding-left:15em;padding-right:0}
body.toc2.toc-right{padding-left:0;padding-right:15em}
body.toc2.toc-right #toc.toc2{border-right-width:0;border-left:1px solid #efefed;left:auto;right:0}}@media only screen and (min-width:1280px){body.toc2{padding-left:20em;padding-right:0}
/* Controls width of panel */
-#toc.toc2{width:25em}
+#toc.toc2{width:20em}
#toc.toc2 #toctitle{font-size:1.375em}
#toc.toc2>ul{font-size:.95em}
#toc.toc2 ul ul{padding-left:1.25em}
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/b19faadf/docs/sql_reference/src/asciidoc/_chapters/about.adoc
----------------------------------------------------------------------
diff --git a/docs/sql_reference/src/asciidoc/_chapters/about.adoc b/docs/sql_reference/src/asciidoc/_chapters/about.adoc
index d8d44dd..fdb1ffe 100644
--- a/docs/sql_reference/src/asciidoc/_chapters/about.adoc
+++ b/docs/sql_reference/src/asciidoc/_chapters/about.adoc
@@ -237,4 +237,5 @@ needs. Send any errors found, suggestions for improvement, or compliments to:
issues@trafodion.incubator.apache.org
Include the document title and any comment, error found, or suggestion for improvement you have concerning this document.
-
+Or, even better, join our community and help us improve our documentation. Please refer to
+http://trafodion.incubator.apache.org/contributing_redirect.html[Trafodion Contributor Guide] for details.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/b19faadf/docs/src/site/markdown/documentation.md
----------------------------------------------------------------------
diff --git a/docs/src/site/markdown/documentation.md b/docs/src/site/markdown/documentation.md
index bc21ff2..720f8cf 100644
--- a/docs/src/site/markdown/documentation.md
+++ b/docs/src/site/markdown/documentation.md
@@ -23,6 +23,7 @@ Trafodion Command Interface Guide | [Web Book](docs/command_interfa
Trafodion Database Connectivity Services Guide | [Web Book](docs/dcs_reference/index.html),[API](docs/dcs_reference/apidocs/index.html)
Trafodion Messages Guide | [Web Book](docs/messages_guide/index.html),[PDF](docs/messages_guide/Trafodion_Messages_Guide.pdf)
Trafodion odb User Guide | [Web Book](docs/odb/index.html),[PDF](docs/odb/Trafodion_odb_User_Guide.pdf)
+Trafodion Provisioning Guide | [Web Book](docs/provisioning_guide/index.html),[PDF](docs/provisioning_guide/Trafodion_Provisioning_Guide.pdf)
Trafodion REST Server Reference Guide | [Web Book](docs/rest_reference/index.html),[API](docs/rest_reference/apidocs/index.html)
Trafodion SQL Reference Manual | [Web Book](docs/sql_reference/index.html),[PDF](docs/sql_reference/Trafodion_SQL_Reference_Manual.pdf)
@@ -35,6 +36,7 @@ Trafodion Command Interface Guide | [Web Book](docs/2.0.0/command_i
Trafodion Database Connectivity Services Guide | [Web Book](docs/2.0.0/dcs_reference/index.html),[API](docs/2.0.0/dcs_reference/apidocs/index.html)
Trafodion Messages Guide | [Web Book](docs/2.0.0/messages_guide/index.html),[PDF](docs/2.0.0/messages_guide/Trafodion_Messages_Guide.pdf)
Trafodion odb User Guide | [Web Book](docs/2.0.0/odb/index.html),[PDF](docs/2.0.0/odb/Trafodion_odb_User_Guide.pdf)
+Trafodion Provisioning Guide | [Web Book](docs/2.0.0/provisioning_guide/index.html),[PDF](docs/2.0.0/provisioning_guide/Trafodion_Provisioning_Guide.pdf)
Trafodion REST Server Reference Guide | [Web Book](docs/2.0.0/rest_reference/index.html),[API](docs/2.0.0/rest_reference/apidocs/index.html)
Trafodion SQL Reference Manual | [Web Book](docs/2.0.0/sql_reference/index.html),[PDF](docs/2.0.0/sql_reference/Trafodion_SQL_Reference_Manual.pdf)
@@ -47,6 +49,7 @@ Trafodion Command Interface Guide | [Web Book](docs/1.3.0/command_i
Trafodion Database Connectivity Services Guide | [Web Book](docs/1.3.0/dcs_reference/index.html),[API](docs/1.3.0/dcs_reference/apidocs/index.html)
Trafodion Messages Guide | [Web Book](docs/1.3.0/messages_guide/index.html),[PDF](docs/1.3.0/messages_guide/Trafodion_Messages_Guide.pdf)
Trafodion odb User Guide | [Web Book](docs/1.3.0/odb/index.html),[PDF](docs/1.3.0/odb/Trafodion_odb_User_Guide.pdf)
+Trafodion Provisioning Guide | [Web Book](docs/1.3.0/provisioning_guide/index.html),[PDF](docs/1.3.0/provisioning_guide/Trafodion_Provisioning_Guide.pdf)
Trafodion REST Server Reference Guide | [Web Book](docs/1.3.0/rest_reference/index.html),[API](docs/1.3.0/rest_reference/apidocs/index.html)
Trafodion SQL Reference Manual | [Web Book](docs/1.3.0/sql_reference/index.html),[PDF](docs/1.3.0/sql_reference/Trafodion_SQL_Reference_Manual.pdf)
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/b19faadf/docs/src/site/markdown/download.md
----------------------------------------------------------------------
diff --git a/docs/src/site/markdown/download.md b/docs/src/site/markdown/download.md
index 22dc728..7fa7e58 100644
--- a/docs/src/site/markdown/download.md
+++ b/docs/src/site/markdown/download.md
@@ -12,10 +12,10 @@
limitations under the
License.
-->
-This page describes how you download and install the Trafodion product environment. Please refer to [Create Development Environment](create-dev-environment.html) if you want to set up a Trafodion development environment (which includes the installation of a stand-alone Hadoop environment) based on the Trafodion source code.
+This page describes how you download and install the Trafodion product environment. Please refer to [Trafodion Contributor Guide](https://cwiki.apache.org/confluence/display/TRAFODION/Trafodion+Contributor+Guide) if you want to set up a Trafodion development environment (which includes the installation of a stand-alone Hadoop environment) based on the Trafodion source code.
# Prerequisite
-Trafodion is installed onto an existing Hadoop environment. Currently, one of the following environments are required:
+Trafodion is installed as an add-on to an existing Hadoop environment. Currently, one of the following environments are required:
* Cloudera CDH 5.2
* Cloudera CDH 5.3
@@ -26,20 +26,14 @@ We're actively working on removing this restriction.
# Download
The Trafodion end-user environment is installed using the Trafodion Installer, which operates on Trafodion binaries only.
-## Binaries
-The Trafodion binaries are available as a tar file.
-
-### 1.3.0 Binaries
+## 1.3.0 Binaries
* [Trafodion Installer](http://traf-builds.esgyn.com/downloads/trafodion/publish/release/1.3.0/apache-trafodion-installer-1.3.0-incubating-bin.tar.gz)
* [Trafodion Server](http://traf-builds.esgyn.com/downloads/trafodion/publish/release/1.3.0/apache-trafodion-1.3.0-incubating-bin.tar.gz)
* [Trafodion Clients](http://traf-builds.esgyn.com/downloads/trafodion/publish/release/1.3.0/apache-trafodion-clients-1.3.0-incubating-bin.tar.gz)
-## Source
-Refer to the [Trafodion Contributor Guide](https://cwiki.apache.org/confluence/display/TRAFODION/Trafodion+Contributor+Guide) for information how to download and build the Trafodion source.
-
# Install
-Please refer to the [Install](install.html) instructions.
+Please refer to the [Trafodion Provisioning Guide](docs/provisioning_guide/index.html) for instructions.