commit a7ae5c9b03866552341fbd03b9f257fc3bc24ec1
author Martin Polreich <polreichmartin@gmail.com> Wed May 29 15:02:32 2019 +0200
committer Martin Polreich <polreichmartin@gmail.com> Wed May 29 21:05:25 2019 +0200
tree 30e4c94e0a536e3a2fa372937d54324867927ee7
parent 2249f8847c432faa0b5d2bd082afb7d2374850bc

Add nginx state to master_config

Related: PROD-27641 and PROD-30528

Change-Id: I8899fdf0eae6a287942d796d0e8b573cf20f4ce5
(cherry picked from commit 6a64e5469000446aaf1c894c3ebe13eaab887953)

config-drive/master_config.yaml

diff --git a/config-drive/master_config.yaml b/config-drive/master_config.yaml
index ccafbc3..cd51ff6 100644
--- a/config-drive/master_config.yaml
+++ b/config-drive/master_config.yaml
@@ -306,6 +306,10 @@
     salt-call ${SALT_OPTS} state.sls linux.network,linux,openssh
     process_salt_base
 
+    _nginx_enabled=$(salt-call --out=newline_values_only pillar.get nginx:server:enabled | tr "[:upper:]" "[:lower:]")
+    if [[ "${_nginx_enabled}" == "true" ]]; then
+      salt-call ${SALT_OPTS} state.apply nginx.server
+    fi
 
     if [ -f /opt/jenkins_in_docker ] || [ -f /opt/postgresql_in_docker ]; then
       process_swarm