summaryrefslogtreecommitdiffstats
path: root/mcp/scripts/docker-compose
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-09-24 17:56:23 +0200
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-09-26 16:17:59 +0000
commita2d33ce77ec3125c5b31ca8cdf0e0be798e671ef (patch)
tree5374c38300cc680e5fc58428eb65b872ce37d72d /mcp/scripts/docker-compose
parenteec6273084ebc69447c479f559472d741143d0c2 (diff)
[ha] Fix missing aodh_version param
_param:aodh_version was lost during a recent refactor, bring it back. While at it, also make chown in entrypoint.sh recursive to prepare for non-sudo deployments. Fixes: c0de0902 Change-Id: I41b225c4a3f15269aa156a1c33412206beff6ee9 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit 6bb830d62451e608cca959e5cb00cd383c8cf01d)
Diffstat (limited to 'mcp/scripts/docker-compose')
-rwxr-xr-xmcp/scripts/docker-compose/files/entrypoint.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/mcp/scripts/docker-compose/files/entrypoint.sh b/mcp/scripts/docker-compose/files/entrypoint.sh
index c7f7f9118..0becb6333 100755
--- a/mcp/scripts/docker-compose/files/entrypoint.sh
+++ b/mcp/scripts/docker-compose/files/entrypoint.sh
@@ -78,7 +78,7 @@ sed -i -e "s|return 'start/running' in |return 'is running' in |" \
find -L /srv/salt /srv/salt/env/prd/_* -maxdepth 1 -type l -delete
# Fix up any permissions after above file shuffling
-sudo chown root:root -R /srv/salt
+chown root:root -R /srv/salt
service ssh start
service salt-minion start