summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTony Hansen <tony@att.com>2017-05-12 22:01:16 +0000
committerTony Hansen <tony@att.com>2017-05-12 22:08:16 +0000
commit482b3a84c594130a938f3b296b7520c0ad57ed5c (patch)
treeb03f09473e58b15f8a441d9d8933856b2842f47d
parent587f173fea324e6ed6e5ccb1a00e5a021fd5b7be (diff)
[DCAE-20] fix for /var/config for postgresql
Change-Id: Iab864e2ac248415df25248d666f130c9b3689ca6 Signed-off-by: Tony Hansen <tony@att.com>
-rw-r--r--OPENECOMP-DEMO/vm-config/vm-postgresql/postgres.conf8
-rw-r--r--OPENECOMP-DEMO/vm-templates/vm-postgresql.yaml13
2 files changed, 8 insertions, 13 deletions
diff --git a/OPENECOMP-DEMO/vm-config/vm-postgresql/postgres.conf b/OPENECOMP-DEMO/vm-config/vm-postgresql/postgres.conf
new file mode 100644
index 0000000..daa0aee
--- /dev/null
+++ b/OPENECOMP-DEMO/vm-config/vm-postgresql/postgres.conf
@@ -0,0 +1,8 @@
+master: ${dcae.vmEnv('PGAASMASTER')}
+secondmaster: ${dcae.vmEnv('PGAASMASTER2')}
+DRTR_NODE_KSTOREFILE: /opt/app/dcae-certificate/keystore.jks
+DRTR_NODE_KSTOREPASS: "%{certPassword}"
+DRTR_NODE_PVTKEYPASS: "%{certPassword}"
+PG_NODES : ${dcae.allServersFqdn().join('|')}
+PG_JAVA_HOME : /opt/app/java/jdk/jdk170
+PG_CLUSTER : site
diff --git a/OPENECOMP-DEMO/vm-templates/vm-postgresql.yaml b/OPENECOMP-DEMO/vm-templates/vm-postgresql.yaml
index 17d16f0..10e7935 100644
--- a/OPENECOMP-DEMO/vm-templates/vm-postgresql.yaml
+++ b/OPENECOMP-DEMO/vm-templates/vm-postgresql.yaml
@@ -171,16 +171,3 @@ controller-instance-configuration:
password: ${dcae.password('postgres.dmaap.viewer')}
role: reader
roleComment: [ admin writer reader]
-vm-setup:
- configuration-files:
- main:
- destination: /tmp/postgres.conf
- content: |-
- master: ${ENV.PGAASMASTER ?: "TDB env.yaml@vm-templates.vm-postgresql.PGAASMASTER"}
- secondmaster: ${ENV.PGAASMASTER2 ?: "TDB env.yaml@vm-templates.vm-postgresql.PGAASMASTER2"}
- DRTR_NODE_KSTOREFILE: /opt/app/dcae-certificate/keystore.jks
- DRTR_NODE_KSTOREPASS: "%{certPassword}"
- DRTR_NODE_PVTKEYPASS: "%{certPassword}"
- PG_NODES : ${dcae.allServersFqdn().join('|')}
- PG_JAVA_HOME : /opt/app/java/jdk/jdk170
- PG_CLUSTER : site