diff options
Diffstat (limited to 'kubernetes')
| -rwxr-xr-x | kubernetes/config/docker/init/config-init.sh | 5 | ||||
| -rw-r--r-- | 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 |