diff options
| author |   Carsten Lund <lund@research.att.com> | 2017-05-05 02:26:33 +0000 |
|---|---|---|
| committer | Carsten Lund <lund@research.att.com> | 2017-05-05 02:26:33 +0000 |
| commit | 96a3aa69a12a257a18572a686366d683d91cf82d (patch) | |
| tree | dfcddeb1201b9f464b5347ab373721360724e569 /OPENECOMP-DEMO | |
| parent | 5e26ea3e299fdd98ddc1eea1bd436a1e2c7389d6 (diff) | |
[DCAE-7] updates for Vanilla Openstack support
Change-Id: Ib49c6afe4c616729aee1ce06d64f50a0765fcde1
Signed-off-by: Carsten Lund <lund@research.att.com>
Diffstat (limited to 'OPENECOMP-DEMO')
5 files changed, 10 insertions, 16 deletions
diff --git a/OPENECOMP-DEMO/vm-config/vm-controller/controller.properties b/OPENECOMP-DEMO/vm-config/vm-controller/controller.properties index 03cc7d6..c2e1c6f 100644 --- a/OPENECOMP-DEMO/vm-config/vm-controller/controller.properties +++ b/OPENECOMP-DEMO/vm-config/vm-controller/controller.properties @@ -16,14 +16,8 @@ server.header.Access-Control-Allow-Credentials: true server.noauth./swagger: server.noauth./swagger server.noauth.swagger: server.noauth.swagger - - server.user.monitoring = uedkkdslafdskljf - - -##policy.endpoint=http://c4.vm1.policy.simpledemo.openecomp.org:8480 -#policy.endpoint=http://10.0.6.1:8480 policy.endpoint=http://policy.api.simpledemo.openecomp.org:8480 policy.user=testrest policy.password=3c0mpU#h01@N1c3 diff --git a/OPENECOMP-DEMO/vm-config/vm-controller/inventory.properties b/OPENECOMP-DEMO/vm-config/vm-controller/inventory.properties new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/OPENECOMP-DEMO/vm-config/vm-controller/inventory.properties diff --git a/OPENECOMP-DEMO/vm-templates/vm-cdap-cluster.yaml b/OPENECOMP-DEMO/vm-templates/vm-cdap-cluster.yaml index d731097..de4c43f 100644 --- a/OPENECOMP-DEMO/vm-templates/vm-cdap-cluster.yaml +++ b/OPENECOMP-DEMO/vm-templates/vm-cdap-cluster.yaml @@ -21,9 +21,9 @@ installation-steps: - step: shell command: | - echo nameserver 10.0.0.1 >> /etc/resolv.conf - echo "prepend domain-name-servers 10.0.0.1;" >> /etc/dhcp/dhclient.conf - echo nameserver 10.0.0.1 >> /etc/resolvconf/resolv.conf.d/head + echo nameserver ${dcae.env('open-ecomp-demo.dns-ip')} >> /etc/resolv.conf + echo "prepend domain-name-servers ${dcae.env('open-ecomp-demo.dns-ip')};" >> /etc/dhcp/dhclient.conf + echo nameserver ${dcae.env('open-ecomp-demo.dns-ip')} >> /etc/resolvconf/resolv.conf.d/head - step: shell command: | diff --git a/OPENECOMP-DEMO/vm-templates/vm-docker-host.yaml b/OPENECOMP-DEMO/vm-templates/vm-docker-host.yaml index e0da7c4..171b305 100644 --- a/OPENECOMP-DEMO/vm-templates/vm-docker-host.yaml +++ b/OPENECOMP-DEMO/vm-templates/vm-docker-host.yaml @@ -104,9 +104,9 @@ installation-steps: - step: shell command: | - echo nameserver 10.0.0.1 >> /etc/resolv.conf - echo "prepend domain-name-servers 10.0.0.1;" >> /etc/dhcp/dhclient.conf - echo nameserver 10.0.0.1 >> /etc/resolvconf/resolv.conf.d/head + echo nameserver ${dcae.env('open-ecomp-demo.dns-ip')} >> /etc/resolv.conf + echo "prepend domain-name-servers ${dcae.env('open-ecomp-demo.dns-ip')};" >> /etc/dhcp/dhclient.conf + echo nameserver ${dcae.env('open-ecomp-demo.dns-ip')} >> /etc/resolvconf/resolv.conf.d/head - step: shell command: | @@ -168,7 +168,7 @@ vm-setup: DMAAPBC_PG_ENABLED=true #DMAAPBC_PGHOST=zldciad1vipstg00.dcae.simpledemo.openecomp.org - DMAAPBC_PGHOST=10.0.4.101 + DMAAPBC_PGHOST=${dcae.env('open-ecomp-demo.postgres-ip')} DMAAPBC_PGCRED=test234-ftl DMAAPBC_DRPROV_FQDN=zldciad1vidrps00.simpledemo.openecomp.org diff --git a/OPENECOMP-DEMO/vm-templates/vm-postgresql.yaml b/OPENECOMP-DEMO/vm-templates/vm-postgresql.yaml index 8d67385..2ab5beb 100644 --- a/OPENECOMP-DEMO/vm-templates/vm-postgresql.yaml +++ b/OPENECOMP-DEMO/vm-templates/vm-postgresql.yaml @@ -48,9 +48,9 @@ installation-steps: - step: shell command: | - echo nameserver 10.0.0.1 >> /etc/resolv.conf - echo "prepend domain-name-servers 10.0.0.1;" >> /etc/dhcp/dhclient.conf - echo nameserver 10.0.0.1 >> /etc/resolvconf/resolv.conf.d/head + echo nameserver ${dcae.env('open-ecomp-demo.dns-ip')} >> /etc/resolv.conf + echo "prepend domain-name-servers ${dcae.env('open-ecomp-demo.dns-ip')};" >> /etc/dhcp/dhclient.conf + echo nameserver ${dcae.env('open-ecomp-demo.dns-ip')} >> /etc/resolvconf/resolv.conf.d/head - step: maven-artifact group-id: org.openecomp.dcae.controller |