Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .env
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ GRAFANA_CONTAINER_PORT=3000
GRAFANA_HOST_PORT=grafana:${GRAFANA_CONTAINER_PORT}
GRAFANA_PROXIES_PATH=localhost/grafana
GRAFANA_DB_NAME=grafana_internal_db
GRAFANA_PASS=grafana

REDIS_PORT=6379
JS_AMP_PORT=3001
Expand All @@ -69,4 +70,3 @@ CTR_SOCKDIR=/var/tmp/nm

ADM_PATH=deps/dtnma-adms

GRAFANA_PASS=grafana
4 changes: 4 additions & 0 deletions puppet/modules/anms/manifests/init.pp
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@
String $ctr_image_tag,
String $version = '',
String $gw_fqdn = $facts['networking']['fqdn'],
String $amp_db_user = 'root',
String $amp_db_password = 'root'
String $opensearch_admin_password = 'admin',
String $grafana_db_password = 'grafana',
Optional[String] $ctr_registry_user = undef,
Optional[String] $ctr_registry_pass = undef,
String $cam_server_url = '',
Expand Down
10 changes: 8 additions & 2 deletions puppet/modules/anms/templates/env.epp
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,20 @@ CAM_AGENT_NAME=<%= $anms::cam_agent_name %>
CAM_AGENT_PASSWORD=<%= $anms::cam_agent_password %>

DB_PORT=5432
DB_USER=root
DB_PASSWORD=root
DB_USER=<%= $anms::amp_db_user %>
DB_PASSWORD=<%= $anms::amp_db_password %>
DB_NAME=amp_core
DB_HEALTHCHECK_USER=healthcheck
DB_HEALTHCHECK_PASSWORD=healthcheck

OPENSEARCH_INITIAL_ADMIN_PASSWORD=<%= $anms::opensearch_admin_password %>

GRAFANA_CONTAINER_PORT=3000
GRAFANA_HOST_PORT=grafana:${GRAFANA_CONTAINER_PORT}
GRAFANA_PROXIES_PATH=localhost/grafana
GRAFANA_DB_NAME=grafana_internal_db
GRAFANA_PASS=<%= $anms::grafana_db_password %>

REDIS_PORT=6379
JS_AMP_PORT=3001
ANMS_UI_HTTP_PORT=9030
Expand All @@ -56,3 +61,4 @@ HOST_SOCKDIR=/run/anms
CTR_SOCKDIR=/var/tmp/nm

ADM_PATH=deps/dtnma-adms

Loading