Templatize invinputs and phinputs, mod inputs.yaml

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

diff --git a/input-templates/inputs.yaml b/input-templates/inputs.yaml
index a4d9b01..7578d25 100644 (file)
--- a/input-templates/inputs.yaml
+++ b/input-templates/inputs.yaml
@@ -1,6 +1,6 @@
 ubuntu1604image_id: '{{ ubuntu_1604_image }}'
 centos7image_id: '{{ centos_7_image }}'
-flavor_id: '{{ flavor_medium }}'
+flavor_id: '{{ flavor_id }}'
 security_group: '{{ security_group }}'
 public_net: '{{ public_net_id }}'
 private_net: '{{ openstack_private_network_name }}'

diff --git a/input-templates/invinputs.yaml b/input-templates/invinputs.yaml
index b5014ce..6e36f3e 100644 (file)
--- a/input-templates/invinputs.yaml
+++ b/input-templates/invinputs.yaml
@@ -1,10 +1,9 @@
-location_id: "onap"
 docker_host_override: "platform_dockerhost"
-asdc_address: ""
-asdc_uri: ""
-asdc_user: ""
-asdc_password: ""
-asdc_environment_name: ""
+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"
 postgres_user_inventory: "postgres"
 postgres_password_inventory: "onap123"
 service_change_handler_image: "nexus3.onap.org:10001/onap/org.onap.dcaegen2.platform.servicechange-handler:latest"

diff --git a/input-templates/phinputs.yaml b/input-templates/phinputs.yaml
index feb86f1..7817498 100644 (file)
--- a/input-templates/phinputs.yaml
+++ b/input-templates/phinputs.yaml
@@ -19,7 +19,7 @@ application_config:
     # In long run we should figure out a way of bringing that info into consul record
     #    related to policy-engine itself.
     policy_engine :
-        url : "https://peawiv9nspd01.pedc.sbc.com:8081"
+        url : "https://{{ policy_ip_addr }}:8081"
         path_pdp : "/pdp/"
         path_api : "/pdp/api/"
         headers :