Merge "Add odl bgpvpn noha scenario to fuel"

[fuel.git] / mcp / scripts / docker-compose / files / entrypoint.sh

diff --git a/mcp/scripts/docker-compose/files/entrypoint.sh b/mcp/scripts/docker-compose/files/entrypoint.sh
index c7f7f91..9bf3cfc 100755 (executable)
--- a/mcp/scripts/docker-compose/files/entrypoint.sh
+++ b/mcp/scripts/docker-compose/files/entrypoint.sh
@@ -43,7 +43,7 @@ cp -a /root/pod_config.yml \
 prefix=/srv/salt/formula/salt-formulas
 rm -f /root/fuel/mcp/salt-formulas/*/.git
 cp -ar /root/fuel/mcp/salt-formulas/* ${prefix}/
-for formula in 'armband' 'opendaylight' 'tacker'; do
+for formula in 'armband' 'opendaylight' 'tacker' 'quagga'; do
     ln -sf /root/fuel/mcp/salt-formulas/salt-formula-${formula}/* \
            /srv/salt/env/prd/
 done
@@ -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