Updates
* Deduplicate salt_bootstrap.sh
* Deduplicate bootstrap.saltstack.com.sh
* Push day01 to use offline salt_bootstrap.sh
* Misc udpates
Change-Id: I89fa2efa73b81a7663581a132207b9a8117e4ae7
diff --git a/day01-image/run.example.sh b/day01-image/run.example.sh
index 9b8602e..e9ada77 100755
--- a/day01-image/run.example.sh
+++ b/day01-image/run.example.sh
@@ -2,7 +2,7 @@
# pre-requirments:
# apt-get install cloud-localds
-# Cloudimg: wget https://cloud-images.ubuntu.com/xenial/current/xenial-server-cloudimg-amd64-disk1.img
+# Cloudimg: wget https://cloud-images.ubuntu.com/xenial/XXXX/xenial-server-cloudimg-amd64-disk1.img
# Packer: https://releases.hashicorp.com/packer/1.1.3/packer_1.1.3_linux_amd64.zip
# Those script - only example for variables, which should be passed to packer and
@@ -12,27 +12,26 @@
# http/bootstrap.saltstack.com.sh https://github.com/saltstack/salt-bootstrap
#
-export CLUSTER_MODEL="https://github.com/jiribroulik/day01.git"
-export CLUSTER_MODEL_REF="master"
-export CLUSTER_NAME="mcp-day01"
-
-export MCP_VERSION="nightly"
-export FORMULA_VERSION="nightly"
-
-BINARY_MCP_VERSION="nightly"
-export UBUNTU_BASEURL="http://mirror.mirantis.com/${BINARY_MCP_VERSION}/ubuntu/"
-export SALTSTACK_REPO="http://apt.mirantis.com/xenial/salt/2016.3/ ${BINARY_MCP_VERSION} main"
+#
+export CLUSTER_MODEL=https://github.com/Mirantis/mcp-drivetrain-model.git
+export CLUSTER_MODEL_REF=master
+export MCP_VERSION=proposed
+export SCRIPTS_REF=master
+export CLUSTER_NAME=mcp-day01
+export FORMULA_VERSION=proposed
+export BINARY_MCP_VERSION=proposed
+export UBUNTU_BASEURL="http://mirror.mirantis.com/proposed/ubuntu/"
+export SALTSTACK_REPO="http://mirror.mirantis.com/proposed/saltstack-2016.3/xenial xenial main"
export APT_MIRANTIS_GPG="http://apt.mirantis.com/public.gpg"
-export SALTSTACK_GPG="${APT_MIRANTIS_GPG}"
-export APT_MIRANTIS_SALT_REPO="http://apt.mirantis.com/xenial/ ${BINARY_MCP_VERSION} salt "
-#
-export GIT_SALT_FORMULAS_SCRIPTS="https://github.com/salt-formulas/salt-formulas-scripts.git"
-#
-export APT_REPOSITORY=" deb [arch=amd64] ${APT_MIRANTIS_SALT_REPO} "
-export APT_REPOSITORY_GPG=${APT_MIRANTIS_GPG}
+export SALTSTACK_GPG="https://repo.saltstack.com/apt/ubuntu/16.04/amd64/2016.3/SALTSTACK-GPG-KEY.pub"
+export APT_MIRANTIS_SALT_REPO="http://apt.mirantis.com/xenial/ proposed salt"
+export GIT_SALT_FORMULAS_SCRIPTS=https://github.com/salt-formulas/salt-formulas-scripts.git
+export APT_REPOSITORY="deb [arch=amd64] http://apt.mirantis.com/xenial/ proposed salt"
+export APT_REPOSITORY_GPG=http://apt.mirantis.com/public.gpg
+###
export PACKER_LOG=1
# For qemu test-build:
cloud-localds --hostname ubuntu --dsmode local config-drive/cloudata.iso config-drive/user-data.yaml
-./packer build -only=qemu -parallel=false -on-error=ask template.json
-rm -rf ~/.packer.d/
+packer build -only=qemu -parallel=false -on-error=ask template.json
+#rm -rf ~/.packer.d/