Revert "Change Artifactory to US"
This reverts commit 35688bd1a312bb0e8912016f6d2de9e2acfc02c0.
Reason for revert: Change to EU
Change-Id: I2d220db02bfa6c8a4f723bacf410cf97e7e2f505
diff --git a/tcp_tests/templates/bm-b300-cicd-queens-ovs-maas/salt-context-cookiecutter-openstack_ovs.yaml b/tcp_tests/templates/bm-b300-cicd-queens-ovs-maas/salt-context-cookiecutter-openstack_ovs.yaml
index 4d927b3..0ddb228 100644
--- a/tcp_tests/templates/bm-b300-cicd-queens-ovs-maas/salt-context-cookiecutter-openstack_ovs.yaml
+++ b/tcp_tests/templates/bm-b300-cicd-queens-ovs-maas/salt-context-cookiecutter-openstack_ovs.yaml
@@ -642,7 +642,7 @@
power_type: ipmi
power_user: ==IPMI_USER==
mcp_version: proposed
- mcp_docker_registry: docker-prod-local.artifactory.mirantis.com
+ mcp_docker_registry: docker-prod-local.docker.mirantis.net
offline_deployment: 'False'
opencontrail_enabled: 'False'
openldap_domain: bm-b300-cicd-queens-ovs-maas.local
diff --git a/tcp_tests/templates/bm-cicd-pike-ovs-maas/salt-context-cookiecutter-openstack_ovs.yaml b/tcp_tests/templates/bm-cicd-pike-ovs-maas/salt-context-cookiecutter-openstack_ovs.yaml
index 4c7b7af..2499b71 100644
--- a/tcp_tests/templates/bm-cicd-pike-ovs-maas/salt-context-cookiecutter-openstack_ovs.yaml
+++ b/tcp_tests/templates/bm-cicd-pike-ovs-maas/salt-context-cookiecutter-openstack_ovs.yaml
@@ -627,7 +627,7 @@
power_type: ipmi
power_user: ==IPMI_USER==
mcp_version: proposed
- mcp_docker_registry: docker-prod-local.artifactory.mirantis.com
+ mcp_docker_registry: docker-prod-local.docker.mirantis.net
offline_deployment: 'False'
opencontrail_enabled: 'False'
openldap_domain: bm-cicd-pike-ovs-maas.local
diff --git a/tcp_tests/templates/bm-cicd-queens-ovs-maas/salt-context-cookiecutter-openstack_ovs.yaml b/tcp_tests/templates/bm-cicd-queens-ovs-maas/salt-context-cookiecutter-openstack_ovs.yaml
index 166bde3..9050b96 100644
--- a/tcp_tests/templates/bm-cicd-queens-ovs-maas/salt-context-cookiecutter-openstack_ovs.yaml
+++ b/tcp_tests/templates/bm-cicd-queens-ovs-maas/salt-context-cookiecutter-openstack_ovs.yaml
@@ -642,7 +642,7 @@
power_type: ipmi
power_user: ==IPMI_USER==
mcp_version: proposed
- mcp_docker_registry: docker-prod-local.artifactory.mirantis.com
+ mcp_docker_registry: docker-prod-local.docker.mirantis.net
offline_deployment: 'False'
opencontrail_enabled: 'False'
openldap_domain: bm-cicd-queens-ovs-maas.local
diff --git a/tcp_tests/templates/bm-e7-cicd-pike-odl-maas/salt-context-cookiecutter-openstack_odl.yaml b/tcp_tests/templates/bm-e7-cicd-pike-odl-maas/salt-context-cookiecutter-openstack_odl.yaml
index cc35f07..abf1834 100644
--- a/tcp_tests/templates/bm-e7-cicd-pike-odl-maas/salt-context-cookiecutter-openstack_odl.yaml
+++ b/tcp_tests/templates/bm-e7-cicd-pike-odl-maas/salt-context-cookiecutter-openstack_odl.yaml
@@ -252,7 +252,7 @@
power_user: ==IPMI_USER==
mcp_version: proposed
- mcp_docker_registry: docker-prod-local.artifactory.mirantis.com
+ mcp_docker_registry: docker-prod-local.docker.mirantis.net
offline_deployment: 'False'
opencontrail_enabled: 'False'
openldap_domain: bm-e7-cicd-pike-odl-maas.local
diff --git a/tcp_tests/templates/bm-e7-cicd-pike-ovs-maas/salt-context-cookiecutter-openstack_ovs.yaml b/tcp_tests/templates/bm-e7-cicd-pike-ovs-maas/salt-context-cookiecutter-openstack_ovs.yaml
index ffd0fcb..026932b 100644
--- a/tcp_tests/templates/bm-e7-cicd-pike-ovs-maas/salt-context-cookiecutter-openstack_ovs.yaml
+++ b/tcp_tests/templates/bm-e7-cicd-pike-ovs-maas/salt-context-cookiecutter-openstack_ovs.yaml
@@ -252,7 +252,7 @@
power_user: ==IPMI_USER==
mcp_version: proposed
- mcp_docker_registry: docker-prod-local.artifactory.mirantis.com
+ mcp_docker_registry: docker-prod-local.docker.mirantis.net
offline_deployment: 'False'
opencontrail_enabled: 'False'
openldap_domain: bm-e7-cicd-pike-ovs-maas.local
diff --git a/tcp_tests/templates/heat-bm-cicd-pike-contrail-sl/salt-context-cookiecutter-contrail.yaml b/tcp_tests/templates/heat-bm-cicd-pike-contrail-sl/salt-context-cookiecutter-contrail.yaml
index ca468df..71c6fe5 100644
--- a/tcp_tests/templates/heat-bm-cicd-pike-contrail-sl/salt-context-cookiecutter-contrail.yaml
+++ b/tcp_tests/templates/heat-bm-cicd-pike-contrail-sl/salt-context-cookiecutter-contrail.yaml
@@ -688,7 +688,7 @@
power_pass: ==IPMI_PASS==
power_type: ipmi
power_user: ==IPMI_USER==
- mcp_docker_registry: docker-prod-local.artifactory.mirantis.com
+ mcp_docker_registry: docker-prod-local.docker.mirantis.net
mcp_version: proposed
offline_deployment: 'False'
opencontrail_analytics_address: ==IPV4_NET_CONTROL_PREFIX==.30
diff --git a/tcp_tests/templates/heat-bm-cicd-queens-contrail-sl/salt-context-cookiecutter-contrail.yaml b/tcp_tests/templates/heat-bm-cicd-queens-contrail-sl/salt-context-cookiecutter-contrail.yaml
index 2790573..adac30b 100644
--- a/tcp_tests/templates/heat-bm-cicd-queens-contrail-sl/salt-context-cookiecutter-contrail.yaml
+++ b/tcp_tests/templates/heat-bm-cicd-queens-contrail-sl/salt-context-cookiecutter-contrail.yaml
@@ -688,7 +688,7 @@
power_pass: ==IPMI_PASS==
power_type: ipmi
power_user: ==IPMI_USER==
- mcp_docker_registry: docker-prod-local.artifactory.mirantis.com
+ mcp_docker_registry: docker-prod-local.docker.mirantis.net
mcp_version: proposed
offline_deployment: 'False'
opencontrail_analytics_address: ==IPV4_NET_CONTROL_PREFIX==.30
diff --git a/tcp_tests/templates/heat-cicd-pike-contrail-stb-sl/salt-context-cookiecutter-contrail.yaml b/tcp_tests/templates/heat-cicd-pike-contrail-stb-sl/salt-context-cookiecutter-contrail.yaml
index 8cbacad..2c04c91 100755
--- a/tcp_tests/templates/heat-cicd-pike-contrail-stb-sl/salt-context-cookiecutter-contrail.yaml
+++ b/tcp_tests/templates/heat-cicd-pike-contrail-stb-sl/salt-context-cookiecutter-contrail.yaml
@@ -114,7 +114,7 @@
maas_hostname: cfg01
maas_manage_deploy_network: 'True'
mcp_version: proposed
- mcp_docker_registry: docker-prod-local.artifactory.mirantis.com
+ mcp_docker_registry: docker-prod-local.docker.mirantis.net
offline_deployment: 'False'
opencontrail_analytics_address: ==IPV4_NET_CONTROL_PREFIX==.30
opencontrail_analytics_hostname: nal
diff --git a/tcp_tests/templates/heat-cicd-pike-dvr-sl/salt-context-cookiecutter.yaml b/tcp_tests/templates/heat-cicd-pike-dvr-sl/salt-context-cookiecutter.yaml
index 92340df..08076e4 100644
--- a/tcp_tests/templates/heat-cicd-pike-dvr-sl/salt-context-cookiecutter.yaml
+++ b/tcp_tests/templates/heat-cicd-pike-dvr-sl/salt-context-cookiecutter.yaml
@@ -162,7 +162,7 @@
maas_enabled: 'False'
maas_fabric_name: deploy_fabric
maas_hostname: cfg01
- mcp_docker_registry: docker-prod-local.artifactory.mirantis.com
+ mcp_docker_registry: docker-prod-local.docker.mirantis.net
mcp_version: proposed
no_platform: 'False'
offline_deployment: 'False'
diff --git a/tcp_tests/templates/heat-cicd-queens-contrail41-sl/salt-context-cookiecutter-contrail.yaml b/tcp_tests/templates/heat-cicd-queens-contrail41-sl/salt-context-cookiecutter-contrail.yaml
index 57c9610..4076dbb 100644
--- a/tcp_tests/templates/heat-cicd-queens-contrail41-sl/salt-context-cookiecutter-contrail.yaml
+++ b/tcp_tests/templates/heat-cicd-queens-contrail41-sl/salt-context-cookiecutter-contrail.yaml
@@ -106,7 +106,7 @@
kubernetes_enabled: 'False'
local_repositories: 'False'
maas_enabled: 'False'
- mcp_docker_registry: docker-prod-local.artifactory.mirantis.com
+ mcp_docker_registry: docker-prod-local.docker.mirantis.net
mcp_version: proposed
offline_deployment: 'False'
openstack_rabbitmq_standalone_mode: 'True'
diff --git a/tcp_tests/templates/heat-cicd-queens-dvr-sl/salt-context-cookiecutter.yaml b/tcp_tests/templates/heat-cicd-queens-dvr-sl/salt-context-cookiecutter.yaml
index dc65316..d53bbca 100644
--- a/tcp_tests/templates/heat-cicd-queens-dvr-sl/salt-context-cookiecutter.yaml
+++ b/tcp_tests/templates/heat-cicd-queens-dvr-sl/salt-context-cookiecutter.yaml
@@ -167,7 +167,7 @@
maas_enabled: 'False'
maas_fabric_name: deploy_fabric
maas_hostname: cfg01
- mcp_docker_registry: docker-prod-local.artifactory.mirantis.com
+ mcp_docker_registry: docker-prod-local.docker.mirantis.net
mcp_version: proposed
no_platform: 'False'
offline_deployment: 'False'
diff --git a/tcp_tests/templates/released-bm-b300-cicd-queens-ovs-maas/salt-context-cookiecutter-openstack_ovs.yaml b/tcp_tests/templates/released-bm-b300-cicd-queens-ovs-maas/salt-context-cookiecutter-openstack_ovs.yaml
index f16087b..a0d2ef6 100644
--- a/tcp_tests/templates/released-bm-b300-cicd-queens-ovs-maas/salt-context-cookiecutter-openstack_ovs.yaml
+++ b/tcp_tests/templates/released-bm-b300-cicd-queens-ovs-maas/salt-context-cookiecutter-openstack_ovs.yaml
@@ -642,7 +642,7 @@
power_type: ipmi
power_user: ==IPMI_USER==
mcp_version: proposed
- mcp_docker_registry: docker-prod-local.artifactory.mirantis.com
+ mcp_docker_registry: docker-prod-local.docker.mirantis.net
offline_deployment: 'False'
opencontrail_enabled: 'False'
openldap_domain: released-bm-b300-cicd-queens-ovs-maas.local
diff --git a/tcp_tests/templates/released-heat-cicd-pike-contrail41-sl/salt-context-cookiecutter-contrail.yaml b/tcp_tests/templates/released-heat-cicd-pike-contrail41-sl/salt-context-cookiecutter-contrail.yaml
index 6c902cf..207c298 100644
--- a/tcp_tests/templates/released-heat-cicd-pike-contrail41-sl/salt-context-cookiecutter-contrail.yaml
+++ b/tcp_tests/templates/released-heat-cicd-pike-contrail41-sl/salt-context-cookiecutter-contrail.yaml
@@ -114,7 +114,7 @@
maas_hostname: cfg01
maas_manage_deploy_network: 'True'
mcp_version: proposed
- mcp_docker_registry: docker-prod-local.artifactory.mirantis.com
+ mcp_docker_registry: docker-prod-local.docker.mirantis.net
offline_deployment: 'False'
opencontrail_analytics_address: ==IPV4_NET_CONTROL_PREFIX==.30
opencontrail_analytics_hostname: nal
diff --git a/tcp_tests/templates/released-heat-cicd-pike-dvr-sl/salt-context-cookiecutter.yaml b/tcp_tests/templates/released-heat-cicd-pike-dvr-sl/salt-context-cookiecutter.yaml
index 1d0c186..03f9af0 100644
--- a/tcp_tests/templates/released-heat-cicd-pike-dvr-sl/salt-context-cookiecutter.yaml
+++ b/tcp_tests/templates/released-heat-cicd-pike-dvr-sl/salt-context-cookiecutter.yaml
@@ -149,7 +149,7 @@
kubernetes_enabled: 'False'
local_repositories: 'False'
mcp_version: proposed
- mcp_docker_registry: docker-prod-local.artifactory.mirantis.com
+ mcp_docker_registry: docker-prod-local.docker.mirantis.net
no_platform: 'False'
offline_deployment: 'False'
opencontrail_enabled: 'False'
diff --git a/tcp_tests/templates/released-heat-cicd-queens-contrail41-sl/salt-context-cookiecutter-contrail.yaml b/tcp_tests/templates/released-heat-cicd-queens-contrail41-sl/salt-context-cookiecutter-contrail.yaml
index 92371fa..cdc4386 100644
--- a/tcp_tests/templates/released-heat-cicd-queens-contrail41-sl/salt-context-cookiecutter-contrail.yaml
+++ b/tcp_tests/templates/released-heat-cicd-queens-contrail41-sl/salt-context-cookiecutter-contrail.yaml
@@ -108,7 +108,7 @@
kubernetes_enabled: 'False'
local_repositories: 'False'
maas_enabled: 'False'
- mcp_docker_registry: docker-prod-local.artifactory.mirantis.com
+ mcp_docker_registry: docker-prod-local.docker.mirantis.net
mcp_version: proposed
offline_deployment: 'False'
opencontrail_analytics_address: ==IPV4_NET_CONTROL_PREFIX==.30
diff --git a/tcp_tests/templates/released-heat-cicd-queens-dvr-sl/salt-context-cookiecutter.yaml b/tcp_tests/templates/released-heat-cicd-queens-dvr-sl/salt-context-cookiecutter.yaml
index 63064ce..1b4ffe0 100644
--- a/tcp_tests/templates/released-heat-cicd-queens-dvr-sl/salt-context-cookiecutter.yaml
+++ b/tcp_tests/templates/released-heat-cicd-queens-dvr-sl/salt-context-cookiecutter.yaml
@@ -165,7 +165,7 @@
maas_enabled: 'False'
maas_fabric_name: deploy_fabric
maas_hostname: cfg01
- mcp_docker_registry: docker-prod-local.artifactory.mirantis.com
+ mcp_docker_registry: docker-prod-local.docker.mirantis.net
mcp_version: proposed
no_platform: 'False'
offline_deployment: 'False'