Remove old workarounds with hardcoded repository addresses
Also, move from apt-mk.mirantis.com to apt.mirantis.com
Change-Id: I4f22ac2c596c0b5663a0ad54f60d93b5ec05e97f
Close-bug: PROD-13582
Reviewed-on: https://review.gerrithub.io/372650
Reviewed-by: Dennis Dmitriev <dis.xcom@gmail.com>
Tested-by: Dennis Dmitriev <dis.xcom@gmail.com>
diff --git a/tcp_tests/templates/virtual-mcp11-ovs-dpdk/salt.yaml b/tcp_tests/templates/virtual-mcp11-ovs-dpdk/salt.yaml
index c0be0a8..19c3928 100644
--- a/tcp_tests/templates/virtual-mcp11-ovs-dpdk/salt.yaml
+++ b/tcp_tests/templates/virtual-mcp11-ovs-dpdk/salt.yaml
@@ -26,39 +26,12 @@
# Install salt to the config node
-#- description: (moved to cloud-init config) Configure repository on the cfg01 node
-# cmd:
-# echo "172.18.248.114 jenkins.mcp.mirantis.net gerrit.mcp.mirantis.net" >> /etc/hosts;
-# echo "185.135.196.10 apt-mk.mirantis.com" >> /etc/hosts;
-# echo "nameserver 172.18.208.44 >> /etc/resolv.conf;
-# echo "nameserver 8.8.8.8 >> /etc/resolv.conf;
-# which wget >/dev/null || (apt-get update; apt-get install -y wget);
-# echo "deb [arch=amd64] http://apt-mk.mirantis.com/xenial nightly salt extra" > /etc/apt/sources.list.d/mcp_salt.list;
-# wget -O - http://apt-mk.mirantis.com/public.gpg | apt-key add -;
-# echo "deb http://repo.saltstack.com/apt/ubuntu/16.04/amd64/2016.3 xenial main" > /etc/apt/sources.list.d/saltstack.list;
-# wget -O - https://repo.saltstack.com/apt/ubuntu/16.04/amd64/2016.3/SALTSTACK-GPG-KEY.pub | apt-key add -;
-# node_name: {{ HOSTNAME_CFG01 }}
-# retry: {count: 1, delay: 1}
-# skip_fail: false
-
-#- description: Update packages on cfg01
-# cmd: apt-get clean; eatmydata apt-get update
-# node_name: {{ HOSTNAME_CFG01 }}
-# retry: {count: 1, delay: 1}
-# skip_fail: false
-
- description: Installing salt master on cfg01
cmd: eatmydata apt-get install -y reclass git salt-master
node_name: {{ HOSTNAME_CFG01 }}
retry: {count: 1, delay: 1}
skip_fail: false
-#- description: (moved to cloud-init config) Install common packages on cfg01
-# cmd: eatmydata apt-get install -y python-pip wget curl tmux byobu iputils-ping traceroute htop tree
-# node_name: {{ HOSTNAME_CFG01 }}
-# retry: {count: 1, delay: 1}
-# skip_fail: false
-
- description: Configure salt-master on cfg01
cmd: |
cat << 'EOF' >> /etc/salt/master.d/master.conf
@@ -140,8 +113,8 @@
- description: Configure reclass
cmd: |
FORMULA_PATH=${FORMULA_PATH:-/usr/share/salt-formulas};
- FORMULA_REPOSITORY=${FORMULA_REPOSITORY:-deb [arch=amd64] http://apt-mk.mirantis.com/xenial {{ REPOSITORY_SUITE }} salt};
- FORMULA_GPG=${FORMULA_GPG:-http://apt-mk.mirantis.com/public.gpg};
+ FORMULA_REPOSITORY=${FORMULA_REPOSITORY:-deb [arch=amd64] http://apt.mirantis.com/xenial {{ REPOSITORY_SUITE }} salt};
+ FORMULA_GPG=${FORMULA_GPG:-http://apt.mirantis.com/public.gpg};
which wget > /dev/null || (apt-get update; apt-get install -y wget);
echo "${FORMULA_REPOSITORY}" > /etc/apt/sources.list.d/mcp_salt.list;
wget -O - "${FORMULA_GPG}" | apt-key add -;