day01 removing params
Change-Id: Ib9d9111eddf5d01014f3ceca7ec11ca879a96564
diff --git a/day01-image/files/root/interfaces b/day01-image/files/root/interfaces
index 944ae9f..5487659 100644
--- a/day01-image/files/root/interfaces
+++ b/day01-image/files/root/interfaces
@@ -11,8 +11,10 @@
auto ens3
iface ens3 inet static
address $SALT_MASTER_DEPLOY_IP
- netmask $SALT_MASTER_DEPLOY_NETMASK
+ netmask $DEPLOY_NETWORK_NETMASK
+ gateway $DEPLOY_NETWORK_GW
+ dns-nameservers $DNS_SERVERS
#auto ens4
#iface ens4 inet static
# address $SALT_MASTER_CONTROL_IP
-# netmask $SALT_MASTER_CONTROL_NETMASK
\ No newline at end of file
+# netmask $SALT_MASTER_CONTROL_NETMASK
diff --git a/day01-image/scripts/salt.sh b/day01-image/scripts/salt.sh
index 6e2dcd0..2869791 100644
--- a/day01-image/scripts/salt.sh
+++ b/day01-image/scripts/salt.sh
@@ -1,13 +1,5 @@
#!/bin/bash -xe
-FORMULA_VERSION=${FORMULA_VERSION:-testing}
-APT_MIRANTIS_SALT_REPO=${APT_MIRANTIS_SALT_REPO:-"http://apt.mirantis.com/xenial/ $FORMULA_VERSION salt"}
-MASTER=`salt-key | grep cfg01`
-
-salt-key
-
-salt-call -t 5 --retcode-passthrough reclass.validate_pillar
-
echo "deb [arch=amd64] ${APT_MIRANTIS_SALT_REPO}" > /etc/apt/sources.list.d/mcp_salt.list
apt-get update
apt-get install salt-formula* -y
diff --git a/day01-image/scripts/salt_bootstrap.sh b/day01-image/scripts/salt_bootstrap.sh
index 73622d0..f23a447 100644
--- a/day01-image/scripts/salt_bootstrap.sh
+++ b/day01-image/scripts/salt_bootstrap.sh
@@ -1,13 +1,5 @@
#!/bin/bash -xe
-CLUSTER_NAME=${CLUSTER_NAME:-mcp-day01}
-CLUSTER_MODEL=${CLUSTER_MODEL:-https://github.com/jiribroulik/day01.git}
CLUSTER_MODEL_REF=${CLUSTER_MODEL_REF:-master}
-FORMULA_VERSION=${FORMULA_VERSION:-testing}
-SALTSTACK_GPG=${SALTSTACK_GPG:-"https://repo.saltstack.com/apt/ubuntu/16.04/amd64/2016.3/SALTSTACK-GPG-KEY.pub"}
-SALTSTACK_REPO=${SALTSTACK_REPO:-"http://repo.saltstack.com/apt/ubuntu/16.04/amd64/2016.3 xenial main"}
-APT_MIRANTIS_GPG=${APT_MIRANTIS_GPG:-"http://apt.mirantis.com/public.gpg"}
-APT_MIRANTIS_SALT_REPO=${APT_MIRANTIS_SALT_REPO:-"http://apt.mirantis.com/xenial/ $FORMULA_VERSION salt"}
-GIT_SALT_FORMULAS_SCRIPTS=${GIT_SALT_FORMULAS_SCRIPTS:-"https://github.com/salt-formulas/salt-formulas-scripts"}
GIT_SALT_FORMULAS_SCRIPTS_REF=${GIT_SALT_FORMULAS_SCRIPTS_REF:-master}
wget -O - ${SALTSTACK_GPG} | sudo apt-key add -