summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarsten Lund <lund@research.att.com>2017-02-20 19:32:34 +0000
committerCarsten Lund <lund@research.att.com>2017-02-20 19:36:16 +0000
commitc0a2677231ecb5104af29822552fb0d981424a42 (patch)
tree511e8ba3f4af7de04ea3a437256b48b7cf9d1587
parent8e9a1b32e3f415054bd0d29c832e79e680398c02 (diff)
Demo configuration changes related to POSTGRES
Change-Id: I5432443a3037a39d2db6e5ecf262a656250e8baa Signed-off-by: Carsten Lund <lund@research.att.com>
-rw-r--r--OPENECOMP-DEMO-RACKSPACE/maven.yaml4
-rw-r--r--OPENECOMP-DEMO/vm-templates/vm-cdap-cluster.yaml4
-rw-r--r--OPENECOMP-DEMO/vm-templates/vm-docker-host.yaml1
-rw-r--r--OPENECOMP-DEMO/vm-templates/vm-postgresql.yaml20
4 files changed, 5 insertions, 24 deletions
diff --git a/OPENECOMP-DEMO-RACKSPACE/maven.yaml b/OPENECOMP-DEMO-RACKSPACE/maven.yaml
index 692ac1d..a19df0f 100644
--- a/OPENECOMP-DEMO-RACKSPACE/maven.yaml
+++ b/OPENECOMP-DEMO-RACKSPACE/maven.yaml
@@ -45,14 +45,10 @@ settings:
<server>
<id>osecomp-nexus</id>
- <username>@{NEXUS-USER}</username>
- <password>@{NEXUS-PASSWORD}</password>
</server>
<server>
<id>osecomp-nexus-snapshots</id>
- <username>@{NEXUS-USER}</username>
- <password>@{NEXUS-PASSWORD}</password>
</server>
</servers>
diff --git a/OPENECOMP-DEMO/vm-templates/vm-cdap-cluster.yaml b/OPENECOMP-DEMO/vm-templates/vm-cdap-cluster.yaml
index 3a7e138..d796dca 100644
--- a/OPENECOMP-DEMO/vm-templates/vm-cdap-cluster.yaml
+++ b/OPENECOMP-DEMO/vm-templates/vm-cdap-cluster.yaml
@@ -71,14 +71,10 @@ installation-steps:
- step: http
url: ${dcae.env('open-ecomp-demo.maven.rawurl')}/org.openecomp.dcae.apod/deb-snapshots/dcae-cdap-small-hadoop_${dcae.env('open-ecomp-demo.versions.apod')}.deb
- user-name: ${dcae.env('open-ecomp-demo.maven.user')}
- password: ${dcae.env('open-ecomp-demo.maven.password')}
type: deb
- step: http
url: ${dcae.env('open-ecomp-demo.maven.rawurl')}/org.openecomp.dcae.apod.analytics/deb-snapshots/dcae-analytics-tca_${dcae.env('open-ecomp-demo.versions.apod')}.deb
- user-name: ${dcae.env('open-ecomp-demo.maven.user')}
- password: ${dcae.env('open-ecomp-demo.maven.password')}
type: deb
- step: http
diff --git a/OPENECOMP-DEMO/vm-templates/vm-docker-host.yaml b/OPENECOMP-DEMO/vm-templates/vm-docker-host.yaml
index 91978af..363f579 100644
--- a/OPENECOMP-DEMO/vm-templates/vm-docker-host.yaml
+++ b/OPENECOMP-DEMO/vm-templates/vm-docker-host.yaml
@@ -181,4 +181,3 @@ vm-setup:
DMAAPBC_PE_ENABLED=false
DMAAPBC_PE_AAF_ENV=TBD
- \ No newline at end of file
diff --git a/OPENECOMP-DEMO/vm-templates/vm-postgresql.yaml b/OPENECOMP-DEMO/vm-templates/vm-postgresql.yaml
index 5e38393..991557c 100644
--- a/OPENECOMP-DEMO/vm-templates/vm-postgresql.yaml
+++ b/OPENECOMP-DEMO/vm-templates/vm-postgresql.yaml
@@ -88,33 +88,23 @@ installation-steps:
application-id: root
- step: http
- url: ${dcae.env('open-ecomp-demo.maven.rawurl')}/org.openecomp.dcae/deb-snapshots/org.openecomp.dcae.storage.pgaas/cdf_${dcae.env('open-ecomp-demo.versions.postgres')}.deb
- user-name: ${dcae.env('open-ecomp-demo.maven.user')}
- password: ${dcae.env('open-ecomp-demo.maven.password')}
+ url: ${dcae.env('open-ecomp-demo.maven.rawurl')}/org.openecomp.dcae.pgaas/deb-snapshots/org.openecomp.dcae.storage.pgaas/cdf_${dcae.env('open-ecomp-demo.versions.postgres')}.deb
type: deb
- step: http
- url: ${dcae.env('open-ecomp-demo.maven.rawurl')}/org.openecomp.dcae/deb-snapshots/org.openecomp.dcae.storage.pgaas/postgresql-prep_${dcae.env('open-ecomp-demo.versions.postgres')}.deb
- user-name: ${dcae.env('open-ecomp-demo.maven.user')}
- password: ${dcae.env('open-ecomp-demo.maven.password')}
+ url: ${dcae.env('open-ecomp-demo.maven.rawurl')}/org.openecomp.dcae.pgaas/deb-snapshots/org.openecomp.dcae.storage.pgaas/postgresql-prep_${dcae.env('open-ecomp-demo.versions.postgres')}.deb
type: deb
- step: http
- url: ${dcae.env('open-ecomp-demo.maven.rawurl')}/org.openecomp.dcae/deb-snapshots/org.openecomp.dcae.storage.pgaas/postgresql-config_${dcae.env('open-ecomp-demo.versions.postgres')}.deb
- user-name: ${dcae.env('open-ecomp-demo.maven.user')}
- password: ${dcae.env('open-ecomp-demo.maven.password')}
+ url: ${dcae.env('open-ecomp-demo.maven.rawurl')}/org.openecomp.dcae.pgaas/deb-snapshots/org.openecomp.dcae.storage.pgaas/postgresql-config_${dcae.env('open-ecomp-demo.versions.postgres')}.deb
type: deb
- step: http
- url: ${dcae.env('open-ecomp-demo.maven.rawurl')}/org.openecomp.dcae/deb-snapshots/org.openecomp.dcae.storage.pgaas/pgaas_${dcae.env('open-ecomp-demo.versions.postgres')}.deb
- user-name: ${dcae.env('open-ecomp-demo.maven.user')}
- password: ${dcae.env('open-ecomp-demo.maven.password')}
+ url: ${dcae.env('open-ecomp-demo.maven.rawurl')}/org.openecomp.dcae.pgaas/deb-snapshots/org.openecomp.dcae.storage.pgaas/pgaas_${dcae.env('open-ecomp-demo.versions.postgres')}.deb
type: deb
- step: http
- url: ${dcae.env('open-ecomp-demo.maven.rawurl')}/org.openecomp.dcae/deb-snapshots/org.openecomp.dcae.storage.pgaas/pgaas-post_${dcae.env('open-ecomp-demo.versions.postgres')}.deb
- user-name: ${dcae.env('open-ecomp-demo.maven.user')}
- password: ${dcae.env('open-ecomp-demo.maven.password')}
+ url: ${dcae.env('open-ecomp-demo.maven.rawurl')}/org.openecomp.dcae.pgaas/deb-snapshots/org.openecomp.dcae.storage.pgaas/pgaas-post_${dcae.env('open-ecomp-demo.versions.postgres')}.deb
type: deb
- step: shell