Move common parts of salt deployment into shared-salt.yaml
- most of common steps for bootstrapping salt moved to
shared-salt.yaml
- default value REPOSITORY_SUITE changed to 'testing'
Change-Id: I7bd66b8e84d266ddd424b788d2a1b5ff0c6ecad4
Reviewed-on: https://review.gerrithub.io/373554
Reviewed-by: Dennis Dmitriev <dis.xcom@gmail.com>
Tested-by: Dennis Dmitriev <dis.xcom@gmail.com>
diff --git a/tcp_tests/templates/virtual-mcp11-k8s-contrail/underlay--user-data1404.yaml b/tcp_tests/templates/virtual-mcp11-k8s-contrail/underlay--user-data1404.yaml
index e9e6a73..2fe252a 100644
--- a/tcp_tests/templates/virtual-mcp11-k8s-contrail/underlay--user-data1404.yaml
+++ b/tcp_tests/templates/virtual-mcp11-k8s-contrail/underlay--user-data1404.yaml
@@ -49,7 +49,7 @@
- echo "Preparing base OS"
- which wget >/dev/null || (apt-get update; apt-get install -y wget)
- sudo add-apt-repository universe
- - echo "deb [arch=amd64] http://apt.mirantis.com/trusty nightly salt extra" > /etc/apt/sources.list.d/mcp_salt.list
+ - echo "deb [arch=amd64] http://apt.mirantis.com/trusty {{ REPOSITORY_SUITE }} salt extra" > /etc/apt/sources.list.d/mcp_salt.list
- wget -O - http://apt.mirantis.com/public.gpg | apt-key add -
- echo "deb http://repo.saltstack.com/apt/ubuntu/14.04/amd64/2016.3 trusty main" > /etc/apt/sources.list.d/saltstack.list
- wget -O - https://repo.saltstack.com/apt/ubuntu/14.04/amd64/2016.3/SALTSTACK-GPG-KEY.pub | apt-key add -