From 44f90cf7a88228d85199225c5ce21ef0574b4f45 Mon Sep 17 00:00:00 2001
From: Andrew Zong <a.zong@f5.com>
Date: Mon, 18 Nov 2019 16:28:13 +0800
Subject: [PATCH] Update the configuration tips for licensing process update.

---
 app/waf/src/controllers/adc.controller.ts |  6 +++++-
 docs/configuration.rst                    | 14 ++++++++------
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/app/waf/src/controllers/adc.controller.ts b/app/waf/src/controllers/adc.controller.ts
index 357f45869..f4098af6a 100644
--- a/app/waf/src/controllers/adc.controller.ts
+++ b/app/waf/src/controllers/adc.controller.ts
@@ -194,7 +194,10 @@ export class AdcController extends BaseController {
       )
       .then(b => this.serialize(adc, {status: AdcState.LICENSED, lastErr: ''}))
       .catch(e =>
-        this.serialize(adc, {status: AdcState.LICENSERROR, lastErr: e}),
+        this.serialize(adc, {
+          status: AdcState.LICENSERROR,
+          lastErr: JSON.stringify(e.message),
+        }),
       );
   }
 
@@ -390,6 +393,7 @@ export class AdcController extends BaseController {
     let data = await this.adcRepository.findById(id, undefined, {
       tenantId: await this.tenantId,
     });
+
     return new Response(Adc, data);
   }
 
diff --git a/docs/configuration.rst b/docs/configuration.rst
index 4f06f91d4..1fb449d9d 100644
--- a/docs/configuration.rst
+++ b/docs/configuration.rst
@@ -17,6 +17,8 @@ The configuration file for ADCaaS application is `appcluster.rc <https://github.
   
   ``ADCAAS_ENABLE_HTTPS``: Whether to use https. Default: ``false``.
 
+  ``ENABLE_EFK``: Whether or not to deploy EFK container for control plane log analysis.
+
 * Postgres configuration:
 
   ``DATABASE_USER``: Database username. Default: ``postgres``.
@@ -51,15 +53,13 @@ The configuration file for ADCaaS application is `appcluster.rc <https://github.
 
 * Onboarding configuration:
 
-  ``DO_ENDPOINT``: DO endpoint. Default: ``https://do-server:443``. ``do-server`` is a link address in docker-compose. Within docker-compose, the DO process listens on ``443``.
-  
-  ``DO_BIGIQ_HOST``: BIG-IQ address. For example: ``10.250.11.138``.
+  ``BIGIQ_HOST``: BIG-IQ address. For example: ``10.250.11.138``.
   
-  ``DO_BIGIQ_USERNAME``: The BIG-IQ username. BIG-IQ is used as a license manager.
+  ``BIGIQ_USERNAME``: The BIG-IQ username. BIG-IQ is used as a license manager.
   
-  ``DO_BIGIQ_PASSWORD``: The BIG-IQ password.
+  ``BIGIQ_PASSWORD``: The BIG-IQ password.
   
-  ``DO_BIGIQ_POOL``: The license pool name on BIG-IQ. 
+  ``BIGIQ_POOL``: The license pool name on BIG-IQ. 
   
   ``DO_RPM_PACKAGE``: DO RPM package. In order to reduce the workload of onboarding, install the DO functionalities to BIG-IP. Default value: ``/var/dependencies/f5-declarative-onboarding-1.5.0-11.noarch.rpm``.
   
@@ -77,6 +77,8 @@ The configuration file for ADCaaS application is `appcluster.rc <https://github.
   
   ``VE_ASM_LEVEL``: Nominal.
 
+  ``VE_RANDOM_PASS``: Whether or not to randomize BIG-IP VE's admin(for webUI) and root(ssh login)'s passwords.
+
 * ASG configuration:
 
   ``ASG_HOST``: ASG hostname. Default: ``asg-server``. It is a linked name in docker-compose.