From 0df22d4ca5193d6d8d8239de4cfe62535fe57fdb Mon Sep 17 00:00:00 2001 From: Lusheng Ji Date: Sun, 29 Oct 2017 21:05:44 -0400 Subject: Update input templates Update the inputs.yaml template to use a zone name based on ONAP deployment's random ID to match with the DNS zone created by dcae2_vm_init.sh script of demo project (Heat template based deployment scheme). Update Inventory input template with values obtained from SDC team. Issue-Id: DCAEGEN2-128 Change-Id: I365849ca398ca5c634eeb70302230ebd95ed003a Signed-off-by: Lusheng Ji --- input-templates/inputs.yaml | 4 ++-- input-templates/invinputs.yaml | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/input-templates/inputs.yaml b/input-templates/inputs.yaml index 71db905..3ded435 100644 --- a/input-templates/inputs.yaml +++ b/input-templates/inputs.yaml @@ -12,7 +12,7 @@ openstack: region: '{{ openstack_region }}' keypair: '{{ key_name }}' key_filename: '/opt/dcae/key' -location_prefix: 'onapr1' -location_domain: 'dcae2.onapdevlab.onap.org' +location_prefix: 'dcae' +location_domain: '{{ dcae_zone }}.dcaeg2.simpledemo.onap.org' codesource_url: 'https://nexus.onap.org/service/local/repositories/raw/content' codesource_version: 'org.onap.dcaegen2.deployments/releases' diff --git a/input-templates/invinputs.yaml b/input-templates/invinputs.yaml index 6e36f3e..90df44b 100644 --- a/input-templates/invinputs.yaml +++ b/input-templates/invinputs.yaml @@ -1,10 +1,10 @@ docker_host_override: "platform_dockerhost" asdc_address: '{{ sdc_ip_addr }}:8443' asdc_uri: 'https://{{ sdc_ip_addr }}:8443' -asdc_user: "ci" -asdc_password: !!str 123456 -asdc_environment_name: "ONAP-AMDOCS" +asdc_user: "dcae" +asdc_password: !!str Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U +asdc_environment_name: "AUTO" postgres_user_inventory: "postgres" postgres_password_inventory: "onap123" -service_change_handler_image: "nexus3.onap.org:10001/onap/org.onap.dcaegen2.platform.servicechange-handler:latest" -inventory_image: "nexus3.onap.org:10001/onap/org.onap.dcaegen2.platform.inventory-api:latest" +service_change_handler_image: "{{ nexus_docker_repo }}/onap/org.onap.dcaegen2.platform.servicechange-handler:latest" +inventory_image: "{{ nexus_docker_repo }}/onap/org.onap.dcaegen2.platform.inventory-api:latest" -- cgit 1.2.3-korg