Skip to content

Commit 3a1e57f

Browse files
authored
Move new production config into puppet module parameters (#328)
1 parent e4a7802 commit 3a1e57f

File tree

3 files changed

+13
-3
lines changed

3 files changed

+13
-3
lines changed

.env

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ GRAFANA_CONTAINER_PORT=3000
4545
GRAFANA_HOST_PORT=grafana:${GRAFANA_CONTAINER_PORT}
4646
GRAFANA_PROXIES_PATH=localhost/grafana
4747
GRAFANA_DB_NAME=grafana_internal_db
48+
GRAFANA_PASS=grafana
4849

4950
REDIS_PORT=6379
5051
JS_AMP_PORT=3001
@@ -69,4 +70,3 @@ CTR_SOCKDIR=/var/tmp/nm
6970

7071
ADM_PATH=deps/dtnma-adms
7172

72-
GRAFANA_PASS=grafana

puppet/modules/anms/manifests/init.pp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@
55
String $ctr_image_tag,
66
String $version = '',
77
String $gw_fqdn = $facts['networking']['fqdn'],
8+
String $amp_db_user = 'root',
9+
String $amp_db_password = 'root'
10+
String $opensearch_admin_password = 'admin',
11+
String $grafana_db_password = 'grafana',
812
Optional[String] $ctr_registry_user = undef,
913
Optional[String] $ctr_registry_pass = undef,
1014
String $cam_server_url = '',

puppet/modules/anms/templates/env.epp

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,20 @@ CAM_AGENT_NAME=<%= $anms::cam_agent_name %>
2525
CAM_AGENT_PASSWORD=<%= $anms::cam_agent_password %>
2626

2727
DB_PORT=5432
28-
DB_USER=root
29-
DB_PASSWORD=root
28+
DB_USER=<%= $anms::amp_db_user %>
29+
DB_PASSWORD=<%= $anms::amp_db_password %>
3030
DB_NAME=amp_core
3131
DB_HEALTHCHECK_USER=healthcheck
3232
DB_HEALTHCHECK_PASSWORD=healthcheck
3333

34+
OPENSEARCH_INITIAL_ADMIN_PASSWORD=<%= $anms::opensearch_admin_password %>
35+
3436
GRAFANA_CONTAINER_PORT=3000
3537
GRAFANA_HOST_PORT=grafana:${GRAFANA_CONTAINER_PORT}
3638
GRAFANA_PROXIES_PATH=localhost/grafana
39+
GRAFANA_DB_NAME=grafana_internal_db
40+
GRAFANA_PASS=<%= $anms::grafana_db_password %>
41+
3742
REDIS_PORT=6379
3843
JS_AMP_PORT=3001
3944
ANMS_UI_HTTP_PORT=9030
@@ -56,3 +61,4 @@ HOST_SOCKDIR=/run/anms
5661
CTR_SOCKDIR=/var/tmp/nm
5762

5863
ADM_PATH=deps/dtnma-adms
64+

0 commit comments

Comments
 (0)