Remove useless APT_REPOSITORY variables
Change-Id: I210427282dba54c46c6c56c3c4df0ab0c8167a6b
diff --git a/trymcp-day01-image/run.example.sh b/trymcp-day01-image/run.example.sh
index 92ad386..3b78bdf 100755
--- a/trymcp-day01-image/run.example.sh
+++ b/trymcp-day01-image/run.example.sh
@@ -15,8 +15,6 @@
#
export APT_MIRANTIS_GPG="http://apt.mirantis.com/public.gpg"
export APT_MIRANTIS_SALT_REPO="http://apt.mirantis.com/xenial/ nightly salt"
-export APT_REPOSITORY="deb [arch=amd64] http://apt.mirantis.com/xenial/ proposed salt"
-export APT_REPOSITORY_GPG="http://apt.mirantis.com/public.gpg"
export CLUSTER_MODEL="https://gerrit.mcp.mirantis.com/trymcp/drivetrain-model"
export CLUSTER_MODEL_REF="master"
export CLUSTER_NAME="try-mcp"
diff --git a/trymcp-day01-image/template.json b/trymcp-day01-image/template.json
index 9e28010..1d99915 100644
--- a/trymcp-day01-image/template.json
+++ b/trymcp-day01-image/template.json
@@ -16,9 +16,7 @@
"saltstack_repo": "{{ env `SALTSTACK_REPO` }}",
"apt_mirantis_gpg": "{{ env `APT_MIRANTIS_GPG` }}",
"apt_mirantis_salt_repo": "{{ env `APT_MIRANTIS_SALT_REPO` }}",
- "git_salt_formulas_scripts": "{{ env `GIT_SALT_FORMULAS_SCRIPTS` }}",
- "apt_repository": "{{ env `APT_REPOSITORY` }}",
- "apt_repository_gpg": "{{ env `APT_REPOSITORY_GPG` }}"
+ "git_salt_formulas_scripts": "{{ env `GIT_SALT_FORMULAS_SCRIPTS` }}"
},
"provisioners": [
{
@@ -58,8 +56,6 @@
"APT_MIRANTIS_GPG={{ user `apt_mirantis_gpg` }}",
"APT_MIRANTIS_SALT_REPO={{ user `apt_mirantis_salt_repo` }}",
"GIT_SALT_FORMULAS_SCRIPTS={{ user `git_salt_formulas_scripts` }}",
- "APT_REPOSITORY={{ user `apt_repository` }}",
- "APT_REPOSITORY_GPG={{ user `apt_repository_gpg` }}",
"APT_MIRANTIS_SALT_REPO={{ user `apt_mirantis_salt_repo` }}",
"BOOTSTRAP_SALTSTACK_COM=file:///opt/bootstrap.saltstack.com.sh",
"MCP_VERSION={{ user `mcp_version` }}",