Pass DISTRIB_REVISION for bootstrap.sh
Change-Id: I48e356c21f0530bafd1e670febfd2fef5fc251c8
diff --git a/mirror-image/salt-bootstrap.sh b/mirror-image/salt-bootstrap.sh
index 97e160a..789ce67 100644
--- a/mirror-image/salt-bootstrap.sh
+++ b/mirror-image/salt-bootstrap.sh
@@ -1,19 +1,19 @@
#!/bin/bash
+
echo "deb [arch=amd64] http://apt.mirantis.com/xenial/ ${MCP_VERSION} salt" > /etc/apt/sources.list.d/mcp_salt.list
+wget -O - http://apt.mirantis.com/public.gpg | apt-key add -
apt-get update
apt-get install git -y
apt-get install salt-formula* -y
-git clone --recursive -b $CLUSTER_MODEL_REF $CLUSTER_MODEL /srv/salt/reclass
+git clone --recursive -b ${CLUSTER_MODEL_REF} ${CLUSTER_MODEL} /srv/salt/reclass
git clone https://github.com/salt-formulas/salt-formulas-scripts /srv/salt/scripts
+# Parameters, for salt-formulas-scripts/bootstrap.sh
export FORMULAS_SOURCE=pkg
export HOSTNAME=apt01
-export DOMAIN=$CLUSTER_NAME.local
-export CLUSTER_NAME=$CLUSTER_NAME
+export DOMAIN=${CLUSTER_NAME}.local
+export CLUSTER_NAME=${CLUSTER_NAME}
+export DISTRIB_REVISION=${MCP_VERSION}
+export EXTRA_FORMULAS="ntp aptly nginx iptables docker"
/srv/salt/scripts/bootstrap.sh
-ln -s /usr/share/salt-formulas/reclass/service/ntp /srv/salt/reclass/classes/service
-ln -s /usr/share/salt-formulas/reclass/service/aptly /srv/salt/reclass/classes/service
-ln -s /usr/share/salt-formulas/reclass/service/nginx /srv/salt/reclass/classes/service
-ln -s /usr/share/salt-formulas/reclass/service/iptables /srv/salt/reclass/classes/service
-ln -s /usr/share/salt-formulas/reclass/service/docker /srv/salt/reclass/classes/service
salt-call state.sls salt
-echo "COMPLETED" > /srv/initComplete
\ No newline at end of file
+echo "COMPLETED" > /srv/initComplete