Add domain to dcae DNS zone

Issue-Id: DCAEGEN2-187
Change-Id: I353a185b45c75ca73485b666f0e95650616dc7d5
Signed-off-by: Lusheng Ji <lji@research.att.com>

diff --git a/input-templates/cdapinputs.yaml b/input-templates/cdapinputs.yaml
index f57a93d..496a922 100644 (file)
--- a/input-templates/cdapinputs.yaml
+++ b/input-templates/cdapinputs.yaml
@@ -13,6 +13,6 @@ openstack:
 keypair: '{{ key_name }}'
 key_filename: '/opt/dcae/key'
 location_prefix: 'dcae'
-location_domain: '{{ dcae_zone }}.dcaeg2.simpledemo.onap.org'
+location_domain: '{{ dcae_zone }}.{{ dcae_domain }}'
 codesource_url: 'https://nexus.onap.org/service/local/repositories/raw/content'
 codesource_version: 'org.onap.dcaegen2.deployments/releases'

diff --git a/input-templates/inputs.yaml b/input-templates/inputs.yaml
index 3ded435..f6cb432 100644 (file)
--- a/input-templates/inputs.yaml
+++ b/input-templates/inputs.yaml
@@ -13,6 +13,6 @@ openstack:
 keypair: '{{ key_name }}'
 key_filename: '/opt/dcae/key'
 location_prefix: 'dcae'
-location_domain: '{{ dcae_zone }}.dcaeg2.simpledemo.onap.org'
+location_domain: '{{ dcae_zone }}.{{ dcae_domain }}'
 codesource_url: 'https://nexus.onap.org/service/local/repositories/raw/content'
 codesource_version: 'org.onap.dcaegen2.deployments/releases'