Skip to content
This repository has been archived by the owner on Aug 12, 2022. It is now read-only.

Update the configuration tips for licensing refining. #372

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update the configuration tips for licensing refining. #372

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion app/waf/src/controllers/adc.controller.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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),
}),
);
}

Expand Down Expand Up @@ -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);
}

Expand Down
14 changes: 8 additions & 6 deletions docs/configuration.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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``.
Expand Down Expand Up @@ -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``.

Expand All @@ -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.
Expand Down