Small refactoring for packer scripts
* Get rid of formula version variable and use MCP_VERSION instead
* Remove docker images pull
* Remove adding of jenkins theme b/c it's already inside docker image
* Move flag for jenkins in docker to /opt
Closes-task: #PROD-24048 (PROD:24048)
Change-Id: I41a1c4771d9cf890bd371264a35727ded6fc52a8
diff --git a/day01-image/run.example.sh b/day01-image/run.example.sh
index bc4a811..6277a71 100755
--- a/day01-image/run.example.sh
+++ b/day01-image/run.example.sh
@@ -18,7 +18,6 @@
export MCP_VERSION=proposed
export SCRIPTS_REF=master
export CLUSTER_NAME=mcp-day01
-export FORMULA_VERSION=proposed
export UBUNTU_BASEURL="http://mirror.mirantis.com/proposed/ubuntu/"
export SALTSTACK_REPO="http://mirror.mirantis.com/proposed/saltstack-2017.7/xenial xenial main"
export APT_MIRANTIS_GPG="http://apt.mirantis.com/public.gpg"
diff --git a/day01-image/scripts/salt.sh b/day01-image/scripts/salt.sh
index ffa106b..6074f21 100644
--- a/day01-image/scripts/salt.sh
+++ b/day01-image/scripts/salt.sh
@@ -1,7 +1,7 @@
#!/bin/bash -xe
-FORMULA_VERSION=${FORMULA_VERSION:-2018.3.1}
-APT_MIRANTIS_SALT_REPO=${APT_MIRANTIS_SALT_REPO:-"http://apt.mirantis.com/xenial/ $FORMULA_VERSION salt"}
+MCP_VERSION=${MCP_VERSION:-proposed}
+APT_MIRANTIS_SALT_REPO=${APT_MIRANTIS_SALT_REPO:-"http://apt.mirantis.com/xenial/ $MCP_VERSION salt"}
SALT_OPTS="-t 10 --retcode-passthrough --no-color"
echo "deb [arch=amd64] ${APT_MIRANTIS_SALT_REPO}" > /etc/apt/sources.list.d/mcp_salt.list
@@ -33,17 +33,8 @@
salt-call ${SALT_OPTS} state.sls_id maas_cluster_packages maas
salt-call ${SALT_OPTS} state.sls_id maas_region_packages maas
-# FIXME move those into cluster model
-git clone https://github.com/Mirantis/docker-jenkins.git
-mkdir -p /srv/volumes/jenkins/userContent/theme/
-cp -r docker-jenkins/theme/* /srv/volumes/jenkins/userContent/theme/
-rm -rf docker-jenkins
-chown -R 1000:1000 /srv/volumes/jenkins/userContent/
-
-docker pull "docker-prod-local.artifactory.mirantis.com/mirantis/cicd/jenkins:${MCP_VERSION}"
-docker pull "docker-prod-local.artifactory.mirantis.com/mirantis/cicd/jnlp-slave:${MCP_VERSION}"
# Flag for cloud-init script
-touch /root/jenkins_in_docker
+touch /opt/jenkins_in_docker
# Duplicate of ubuntu_info.sh
mkdir -p /var/log/bootstrap_logs/ ; pushd /var/log/bootstrap_logs/
diff --git a/day01-image/template.json b/day01-image/template.json
index e7d90d3..741b7b6 100644
--- a/day01-image/template.json
+++ b/day01-image/template.json
@@ -10,7 +10,6 @@
"cluster_model_ref": "{{ env `CLUSTER_MODEL_REF` }}",
"cluster_name": "{{ env `CLUSTER_NAME` }}",
"bs_hostname": "cfg01",
- "formula_version": "{{ env `FORMULA_VERSION` }}",
"mcp_version": "{{ env `MCP_VERSION` }}",
"ubuntu_baseurl": "{{ env `UBUNTU_BASEURL` }}",
"saltstack_gpg": "{{ env `SALTSTACK_GPG` }}",
@@ -55,7 +54,6 @@
"CLUSTER_MODEL_REF={{ user `cluster_model_ref` }}",
"CLUSTER_NAME={{ user `cluster_name` }}",
"BS_HOSTNAME={{ user `bs_hostname` }}",
- "FORMULA_VERSION={{ user `formula_version` }}",
"SALTSTACK_GPG={{ user `saltstack_gpg` }}",
"SALTSTACK_REPO={{ user `saltstack_repo` }}",
"APT_MIRANTIS_GPG={{ user `apt_mirantis_gpg` }}",
@@ -63,7 +61,6 @@
"GIT_SALT_FORMULAS_SCRIPTS={{ user `git_salt_formulas_scripts` }}",
"APT_REPOSITORY={{ user `apt_repository` }}",
"APT_REPOSITORY_GPG={{ user `apt_repository_gpg` }}",
- "FORMULA_VERSION={{ user `formula_version` }}",
"APT_MIRANTIS_SALT_REPO={{ user `apt_mirantis_salt_repo` }}",
"BOOTSTRAP_SALTSTACK_COM=file:///opt/bootstrap.saltstack.com.sh",
"MCP_VERSION={{ user `mcp_version` }}",