From da7a79cc3e5d31d006033d3dc441d44f29d9b045 Mon Sep 17 00:00:00 2001 From: Gary Wu Date: Wed, 24 Jan 2018 14:40:39 -0800 Subject: Fix onap-parameters issue when not using proxy Fix onap-parameters issue when not using proxy for designate, but IS_SAME_OPENSTACK_AS_VNF is true. In this case, the OPENSTACK_KEYSTONE_URL parameters were not being properly set for dcae_keystone_url. This change fixes the issue. Change-Id: Icef25f38caeaaffebef6cec17571df36cdfd5335 Issue-ID: OOM-615 Signed-off-by: Gary Wu --- kubernetes/config/docker/init/config-init.sh | 5 ++++- kubernetes/config/values.yaml | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/kubernetes/config/docker/init/config-init.sh b/kubernetes/config/docker/init/config-init.sh index 9d8e5877ed..e0b34026dc 100755 --- a/kubernetes/config/docker/init/config-init.sh +++ b/kubernetes/config/docker/init/config-init.sh @@ -246,8 +246,11 @@ then if [ "$DNSAAS_PROXY_ENABLE" = "true" ] then find /config-init/$NAMESPACE/dcaegen2/heat/ -type f -exec sed -i -e "s,DCAE_FINAL_KEYSTONE_URL_HERE,$DCAE_PROXIED_KEYSTONE_URL,g" {} \; - else + elif [ "$IS_SAME_OPENSTACK_AS_VNF" = "false" ] + then find /config-init/$NAMESPACE/dcaegen2/heat/ -type f -exec sed -i -e "s,DCAE_FINAL_KEYSTONE_URL_HERE,$DCAE_OS_KEYSTONE_URL/$DCAE_OS_API_VERSION,g" {} \; + else + find /config-init/$NAMESPACE/dcaegen2/heat/ -type f -exec sed -i -e "s,DCAE_FINAL_KEYSTONE_URL_HERE,$OPENSTACK_KEYSTONE_URL/$OPENSTACK_API_VERSION,g" {} \; fi fi diff --git a/kubernetes/config/values.yaml b/kubernetes/config/values.yaml index a52d2953c1..c26e804ccc 100644 --- a/kubernetes/config/values.yaml +++ b/kubernetes/config/values.yaml @@ -3,5 +3,5 @@ nsPrefix: onap dockerSharePath: /dockerdata-nfs image: repository: oomk8s/config-init - tag: 1.1.9 + tag: 1.1.10 pullPolicy: Always -- cgit 1.2.3-korg