From 7b416393434a53cdb6e5d310b7a648e7bc2b21e5 Mon Sep 17 00:00:00 2001 From: Gary Wu Date: Fri, 19 Jan 2018 13:16:49 -0800 Subject: Add windriver env file for OOM heat template Change-Id: I9dfddd4ac3f119243a120db3d20e41871ac91ff5 Issue-ID: INT-381 Signed-off-by: Gary Wu --- deployment/heat/onap-oom/k8s_vm_entrypoint.sh | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'deployment/heat/onap-oom/k8s_vm_entrypoint.sh') diff --git a/deployment/heat/onap-oom/k8s_vm_entrypoint.sh b/deployment/heat/onap-oom/k8s_vm_entrypoint.sh index cae0f392b..db2428ba9 100644 --- a/deployment/heat/onap-oom/k8s_vm_entrypoint.sh +++ b/deployment/heat/onap-oom/k8s_vm_entrypoint.sh @@ -145,15 +145,16 @@ OPENSTACK_USERNAME: "__openstack_username__" OPENSTACK_API_KEY: "__openstack_api_key__" OPENSTACK_KEYSTONE_URL: "__keystone_url__" DCAE_IP_ADDR: "__dcae_ip_addr__" -DCAE_KEYSTONE_URL: "__keystone_url__/v2.0" -DNS_LIST: "__dns_list__" +DCAE_KEYSTONE_URL: "__dcae_keystone_url__" +DNS_LIST: "__dns_forwarder__" DNS_FORWARDER: "__dns_forwarder__" -EXTERNAL_DNS: "8.8.8.8" -DNSAAS_REGION: "RegionOne" -DNSAAS_KEYSTONE_URL: "__keystone_url__/v2.0" -DNSAAS_TENANT_NAME: "__openstack_tenant_name__" -DNSAAS_USERNAME: "__openstack_username__" -DNSAAS_PASSWORD: "__openstack_api_key__" +EXTERNAL_DNS: "__external_dns__" +DNSAAS_PROXY_ENABLE: "__dnsaas_proxy_enable__" +DNSAAS_KEYSTONE_URL: "__dnsaas_keystone_url__" +DNSAAS_REGION: "__dnsaas_region__" +DNSAAS_TENANT_NAME: "__dnsaas_tenant_name__" +DNSAAS_USERNAME: "__dnsaas_username__" +DNSAAS_PASSWORD: "__dnsaas_password__" EOF cat ~/oom/kubernetes/config/onap-parameters.yaml -- cgit 1.2.3-korg