8 files changed, 45 insertions, 13 deletions
diff --git a/blueprints/inventory.yaml-template b/blueprints/inventory.yaml-template
index 7e209d9..4da253c 100644
--- a/blueprints/inventory.yaml-template
+++ b/blueprints/inventory.yaml-template
@@ -48,6 +48,14 @@ inputs:
     description: SDC password
   asdc_environment_name:
     description: SDC environment name
+  asdc_use_secure_https:
+    description: Boolean to toggle whether to do certificate validation for https calls to SDC API
+    type: boolean
+    default: false
+  asdc_use_https_dmaap:
+    description: Boolean to toggle whether to use https for calls to message router API
+    type: boolean
+    default: false
 
   postgres_user_inventory:
     description: Postgres user for inventory
@@ -79,7 +87,8 @@ node_templates:
           environmentName: { get_input: asdc_environment_name }
           keyStorePath:
           keyStorePassword:
-          activateServerTLSAuth: false
+          activateServerTLSAuth: { get_input: asdc_use_secure_https }
+          useHttpsWithDmaap: { get_input: asdc_use_https_dmaap }
           isFilterInEmptyResources: false
         dcaeInventoryClient:
           uri: http://inventory:8080
diff --git a/input-templates/he-ip.yaml b/input-templates/he-ip.yaml
new file mode 100644
index 0000000..2d0fd6e
--- /dev/null
+++ b/input-templates/he-ip.yaml
@@ -0,0 +1,6 @@
+{
+  "dh_location_id": "loc1",
+  "docker_host_override": "component_dockerhost",
+  "msb_hostname": "{{ openo_ip_addr }}",
+  "dcae_CL_publish_url": "http://{{ mr_ip_addr }}:3904/events/unauthenticated.DCAE_CL_OUTPUT"
+}
diff --git a/input-templates/hr-ip.yaml b/input-templates/hr-ip.yaml
new file mode 100644
index 0000000..856f195
--- /dev/null
+++ b/input-templates/hr-ip.yaml
@@ -0,0 +1,7 @@
+{
+  "dh_location_id": "loc1",
+  "docker_host_override": "component_dockerhost",
+  "msb_hostname": "{{ openo_ip_addr }}",
+  "ves_fault_publish_url": "http://{{ mr_ip_addr }}:3904/events/unauthenticated.SEC_FAULT_OUTPUT"
+}
+
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"
diff --git a/input-templates/phinputs.yaml b/input-templates/phinputs.yaml
index 7817498..1422802 100644
--- a/input-templates/phinputs.yaml
+++ b/input-templates/phinputs.yaml
@@ -2,17 +2,17 @@ application_config:
   policy_handler :
     # parallelize the getConfig queries to policy-engine on each policy-update notification
     thread_pool_size : 4
- 
+
     # parallelize requests to policy-engine and keep them alive
     pool_connections : 20
- 
+
     # list of policyName prefixes (filters) that DCAE-Controller handles (=ignores any other policyName values)
     scope_prefixes : ["DCAE.Config_"]
- 
+
     # retry to getConfig from policy-engine on policy-update notification
     policy_retry_count : 5
     policy_retry_sleep : 5
- 
+
     # policy-engine config
     # These are the url of and the auth for the external system, namely the policy-engine (PDP).
     # We obtain that info manually from PDP folks at the moment.
@@ -25,7 +25,7 @@ application_config:
         headers :
             Accept : "application/json"
             "Content-Type" : "application/json"
-            ClientAuth : "Basic bTAzOTQ5OnBvbGljeVIwY2sk"
+            ClientAuth : "cHl0aG9uOnRlc3Q="
             Authorization : "Basic dGVzdHBkcDphbHBoYTEyMw=="
             Environment : "TEST"
         target_entity : "policy_engine"
diff --git a/input-templates/tcainputs.yaml b/input-templates/tcainputs.yaml
new file mode 100644
index 0000000..243821a
--- /dev/null
+++ b/input-templates/tcainputs.yaml
@@ -0,0 +1,3 @@
+{
+  "name": "TCA"
+}
diff --git a/input-templates/vesinput.yaml b/input-templates/vesinput.yaml
new file mode 100644
index 0000000..6a3d98c
--- /dev/null
+++ b/input-templates/vesinput.yaml
@@ -0,0 +1,7 @@
+vesinput.yaml
+{
+  "dh_location_id": "{{ dcae_zone }}",
+  "dh_override": "component_dockerhost",
+  "ves_fault_publish_url": "http://{{ mr_ip_addr }}:3904/events/unauthenticated.SEC_FAULT_OUTPUT/",
+  "ves_measurement_publish_url": "http://{{ mr_ip_addr }}:3904/events/unauthenticated.SEC_MEASUREMENT_OUTPUT/"
+}