Fix env pass for ubuntu-16.04
Change-Id: I317f5f46ca8beeb0d44bf66364af8b2a51d67d2f
diff --git a/common/ubuntu_base.sh b/common/ubuntu_base.sh
index aafae3a..bca322d 100644
--- a/common/ubuntu_base.sh
+++ b/common/ubuntu_base.sh
@@ -1,6 +1,6 @@
#!/bin/bash -xe
-UBUNTU_BASEURL="${UBUNTU_BASEURL:-"mirror://mirrors.ubuntu.com/mirrors.txt"}"
+UBUNTU_BASEURL="${UBUNTU_BASEURL:-mirror://mirrors.ubuntu.com/mirrors.txt}"
## Base packages and setup
export DEBIAN_FRONTEND=noninteractive
diff --git a/ubuntu-16.04/template.json b/ubuntu-16.04/template.json
index 400a237..bdfa4c1 100644
--- a/ubuntu-16.04/template.json
+++ b/ubuntu-16.04/template.json
@@ -4,7 +4,7 @@
"password": "ho5uo7Uome5d",
"distro": "ubuntu-16-04-x64",
"disk_size": "8000",
- "ubuntu_baseurl": "https://mirror.mirantis.com/proposed/",
+ "ubuntu_baseurl": "https://mirror.mirantis.com/proposed/ubuntu/",
"saltstack_repo": "deb [arch=amd64] https://mirror.mirantis.com/proposed/saltstack-2016.3/xenial/ xenial main",
"do_api_token": "{{ env `DO_API_TOKEN` }}",
"image_name": "ubuntu-16-04-x64",
@@ -19,12 +19,14 @@
},
"provisioners": [
{
+ "type": "shell",
+ "execute_command": "chmod +x {{ .Path }}; {{ .Vars }} {{ .Path }}",
+ "expect_disconnect": "true",
"environment_vars": [
"UBUNTU_BASEURL={{ user `ubuntu_baseurl` }}",
- "SALTSTACK_GPG={{ user `saltstack_gpg` }}"
+ "SALTSTACK_GPG={{ user `saltstack_gpg` }}",
+ "SALTSTACK_REPO={{ user `saltstack_repo` }}"
],
- "type": "shell",
- "execute_command": "sh '{{.Path}}'",
"override": {
"virtualbox-iso": {
"scripts": [