entrypoint: Always run puppet.

Puppet writes the current DNS servers into nginx's config, which may
vary each time the image starts up, depending on the network it is
attached to.  We can either write custom logic to mirror Puppet's
behaviour, or just always run Puppet.

Author: alexmv

entrypoint.sh

@@ -131,34 +131,23 @@ nginxConfiguration() {
     sed -i "s/proxy_buffering .*/proxy_buffering $NGINX_PROXY_BUFFERING;/g" /etc/nginx/zulip-include/proxy_longpolling
     echo "Nginx configuration succeeded."
 }
-additionalPuppetConfiguration() {
-    echo "Executing additional puppet configuration ..."
-
-    local changedPuppetConf=false
+puppetConfiguration() {
+    echo "Executing puppet configuration ..."
 
     if [ "$QUEUE_WORKERS_MULTIPROCESS" == "True" ] || [ "$QUEUE_WORKERS_MULTIPROCESS" == "true" ]; then
         echo "Setting queue workers to run in multiprocess mode ..."
         crudini --set /etc/zulip/zulip.conf application_server queue_workers_multiprocess true
-        changedPuppetConf=true
     elif [ "$QUEUE_WORKERS_MULTIPROCESS" == "False" ] || [ "$QUEUE_WORKERS_MULTIPROCESS" == "false" ]; then
         echo "Setting queue workers to run in multithreaded mode ..."
         crudini --set /etc/zulip/zulip.conf application_server queue_workers_multiprocess false
-        changedPuppetConf=true
-    else
-        echo "No additional puppet configuration executed for queue workers."
     fi
 
     if [ -n "$LOADBALANCER_IPS" ]; then
         echo "Setting IPs for load balancer"
         crudini --set /etc/zulip/zulip.conf loadbalancer ips "${LOADBALANCER_IPS}"
-        changedPuppetConf=true
-    else
-        echo "No additional puppet configuration executed for load balancer IPs."
     fi
 
-    if [ "$changedPuppetConf" = true ]; then
-        /home/zulip/deployments/current/scripts/zulip-puppet-apply -f
-    fi
+    /home/zulip/deployments/current/scripts/zulip-puppet-apply -f
 }
 configureCerts() {
     case "$SSL_CERTIFICATE_GENERATION" in