diff options
| author |   Alexis de Talhouët <adetalhouet89@gmail.com> | 2018-01-23 11:04:43 -0500 |
|---|---|---|
| committer | Alexis de Talhouët <adetalhouet89@gmail.com> | 2018-01-23 13:58:42 -0500 |
| commit | f6c0855f03b99fcca9f411370221fe9ffa48e889 (patch) | |
| tree | 079b0a6f1a3a5ed7ae5b8001a0650911ee697874 /kubernetes/config/docker/init/src/config/dcaegen2/heat/entrypoint.sh | |
| parent | bbfe29d8cabfd347fa75e947a5753f7aa9a24177 (diff) | |
Do not cache host resolution in DCAEGEN2 nginx
And fix DNS Designate proxy setup
Change-Id: I46c265ba8f66f81503b8cdc8c0f90f9e5956da86
Issue-ID: OOM-608
Signed-off-by: Alexis de Talhouët <adetalhouet89@gmail.com>
Diffstat (limited to 'kubernetes/config/docker/init/src/config/dcaegen2/heat/entrypoint.sh')
| -rwxr-xr-x | kubernetes/config/docker/init/src/config/dcaegen2/heat/entrypoint.sh | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/kubernetes/config/docker/init/src/config/dcaegen2/heat/entrypoint.sh b/kubernetes/config/docker/init/src/config/dcaegen2/heat/entrypoint.sh index 85c5ee2b13..bbf47a9bac 100755 --- a/kubernetes/config/docker/init/src/config/dcaegen2/heat/entrypoint.sh +++ b/kubernetes/config/docker/init/src/config/dcaegen2/heat/entrypoint.sh @@ -130,12 +130,12 @@ mv ./kubectl /usr/local/bin/kubectl # Get the Kubernetes Node IP hosting the DCAE NGINX pod NODE_IP=`kubectl get services dcaegen2 -o jsonpath='{.status.loadBalancer.ingress[0].ip}'` -# # Source OpenStack parameters -if [ "OPENSTACK_API_VERSION_HERE" = "v2.0" ] +# Source OpenStack parameters to deploy DCAE +if [ "DCAE_OS_API_VERSION_HERE" = "v2.0" ] then - source /opt/heat/OOM-openrc-v2.sh + source /opt/heat/DCAE-openrc-v2.sh else - source /opt/heat/OOM-openrc-v3.sh + source /opt/heat/DCAE-openrc-v3.sh fi # Create stasck if doens't exist @@ -153,6 +153,14 @@ then sed -i -e "s/DCAE_CONTROLLER_IP_HERE/$DCAE_CONTROLLER_IP/g" /opt/robot/vm_properties.py; fi +# Source OpenStack parameters for DNS Designate +if [ "DNSAAS_API_VERSION_HERE" = "v2.0" ] +then + source /opt/heat/DNS-openrc-v2.sh +else + source /opt/heat/DNS-openrc-v3.sh +fi + configure_dns_designate monitor_nginx_node_ip
\ No newline at end of file |