Fix typo in gpg key path
diff --git a/tcp_tests/templates/salt/mcp-fuel-aio-salt.yaml b/tcp_tests/templates/salt/mcp-fuel-aio-salt.yaml
index 6b4dd86..618dbbf 100644
--- a/tcp_tests/templates/salt/mcp-fuel-aio-salt.yaml
+++ b/tcp_tests/templates/salt/mcp-fuel-aio-salt.yaml
@@ -7,8 +7,8 @@
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;
+ 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 -;
@@ -84,7 +84,7 @@
cmd: |
FORMULA_PATH=${FORMULA_PATH:-/usr/share/salt-formulas};
FORMULA_REPOSITORY=${FORMULA_REPOSITORY:-deb [arch=amd64] http://apt-mk.mirantis.com/xenial stable salt};
- FORMULA_GPG=${FORMULA_GPG:-http://apt-mirantis.com/public.gpg};
+ FORMULA_GPG=${FORMULA_GPG:-http://apt-mk.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 -;
diff --git a/tcp_tests/templates/salt/virtual-mcp-ocata-dvr-salt.yaml b/tcp_tests/templates/salt/virtual-mcp-ocata-dvr-salt.yaml
index c517332..e6f7a4a 100644
--- a/tcp_tests/templates/salt/virtual-mcp-ocata-dvr-salt.yaml
+++ b/tcp_tests/templates/salt/virtual-mcp-ocata-dvr-salt.yaml
@@ -7,8 +7,8 @@
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;
+ 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 -;
@@ -84,7 +84,7 @@
cmd: |
FORMULA_PATH=${FORMULA_PATH:-/usr/share/salt-formulas};
FORMULA_REPOSITORY=${FORMULA_REPOSITORY:-deb [arch=amd64] http://apt-mk.mirantis.com/xenial stable salt};
- FORMULA_GPG=${FORMULA_GPG:-http://apt-mirantis.com/public.gpg};
+ FORMULA_GPG=${FORMULA_GPG:-http://apt-mk.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 -;
diff --git a/tcp_tests/templates/salt/virtual-mcp-ocata-ovs-salt.yaml b/tcp_tests/templates/salt/virtual-mcp-ocata-ovs-salt.yaml
index b5f88cc..a1cafcc 100644
--- a/tcp_tests/templates/salt/virtual-mcp-ocata-ovs-salt.yaml
+++ b/tcp_tests/templates/salt/virtual-mcp-ocata-ovs-salt.yaml
@@ -7,8 +7,8 @@
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;
+ 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 -;
@@ -84,7 +84,7 @@
cmd: |
FORMULA_PATH=${FORMULA_PATH:-/usr/share/salt-formulas};
FORMULA_REPOSITORY=${FORMULA_REPOSITORY:-deb [arch=amd64] http://apt-mk.mirantis.com/xenial stable salt};
- FORMULA_GPG=${FORMULA_GPG:-http://apt-mirantis.com/public.gpg};
+ FORMULA_GPG=${FORMULA_GPG:-http://apt-mk.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 -;
diff --git a/tcp_tests/templates/salt/virtual-mcp10-ovs-salt.yaml b/tcp_tests/templates/salt/virtual-mcp10-ovs-salt.yaml
index 5727dbe..65cee24 100644
--- a/tcp_tests/templates/salt/virtual-mcp10-ovs-salt.yaml
+++ b/tcp_tests/templates/salt/virtual-mcp10-ovs-salt.yaml
@@ -7,8 +7,8 @@
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;
+ 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 -;
diff --git a/tcp_tests/templates/salt/virtual-mcp11-dvr-salt.yaml b/tcp_tests/templates/salt/virtual-mcp11-dvr-salt.yaml
index 48bfe59..18cdb24 100644
--- a/tcp_tests/templates/salt/virtual-mcp11-dvr-salt.yaml
+++ b/tcp_tests/templates/salt/virtual-mcp11-dvr-salt.yaml
@@ -7,8 +7,8 @@
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;
+ 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 -;
@@ -84,7 +84,7 @@
cmd: |
FORMULA_PATH=${FORMULA_PATH:-/usr/share/salt-formulas};
FORMULA_REPOSITORY=${FORMULA_REPOSITORY:-deb [arch=amd64] http://apt-mk.mirantis.com/xenial stable salt};
- FORMULA_GPG=${FORMULA_GPG:-http://apt-mirantis.com/public.gpg};
+ FORMULA_GPG=${FORMULA_GPG:-http://apt-mk.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 -;
diff --git a/tcp_tests/templates/salt/virtual-mcp11-ovs-salt.yaml b/tcp_tests/templates/salt/virtual-mcp11-ovs-salt.yaml
index 1782263..bbb557d 100644
--- a/tcp_tests/templates/salt/virtual-mcp11-ovs-salt.yaml
+++ b/tcp_tests/templates/salt/virtual-mcp11-ovs-salt.yaml
@@ -7,8 +7,8 @@
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;
+ 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 -;
@@ -84,7 +84,7 @@
cmd: |
FORMULA_PATH=${FORMULA_PATH:-/usr/share/salt-formulas};
FORMULA_REPOSITORY=${FORMULA_REPOSITORY:-deb [arch=amd64] http://apt-mk.mirantis.com/xenial stable salt};
- FORMULA_GPG=${FORMULA_GPG:-http://apt-mirantis.com/public.gpg};
+ FORMULA_GPG=${FORMULA_GPG:-http://apt-mk.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 -;