Move mcp_docker_registry to defaults
Change-Id: I8645f8df5290112106ef01801f8db86505c327c9
diff --git a/defaults/init.yml b/defaults/init.yml
index 3f2e3f8..9674799 100644
--- a/defaults/init.yml
+++ b/defaults/init.yml
@@ -18,3 +18,5 @@
linux_system_repo_url: "http://mirror.mirantis.com/${_param:apt_mk_version}/"
# Openstack globals
openstack_version: 'queens'
+ # Docker artifact globals
+ mcp_docker_registry: 'docker-prod-local.artifactory.mirantis.com'
diff --git a/docker/swarm/stack/decapod.yml b/docker/swarm/stack/decapod.yml
index 2d915fc..c0cf8a6 100644
--- a/docker/swarm/stack/decapod.yml
+++ b/docker/swarm/stack/decapod.yml
@@ -1,6 +1,5 @@
parameters:
_param:
- mcp_docker_registry: 'docker-prod-local.artifactory.mirantis.com'
docker_decapod_fe_replicas: 3
decapod_version: latest
docker_image_admin: ${_param:mcp_docker_registry}/mirantis/ceph/decapod/admin:${_param:decapod_version}
diff --git a/docker/swarm/stack/devops_portal.yml b/docker/swarm/stack/devops_portal.yml
index c7790d8..495526a 100644
--- a/docker/swarm/stack/devops_portal.yml
+++ b/docker/swarm/stack/devops_portal.yml
@@ -1,6 +1,5 @@
parameters:
_param:
- mcp_docker_registry: 'docker-prod-local.artifactory.mirantis.com'
docker_devops_portal_replicas: 1
docker_image_devops_portal: ${_param:mcp_docker_registry}/mirantis/oss/devops-portal:latest
docker:
diff --git a/docker/swarm/stack/hce.yml b/docker/swarm/stack/hce.yml
index a2d4505..38e92ff 100644
--- a/docker/swarm/stack/hce.yml
+++ b/docker/swarm/stack/hce.yml
@@ -1,6 +1,5 @@
parameters:
_param:
- mcp_docker_registry: 'docker-prod-local.artifactory.mirantis.com'
docker_hce_replicas: 1
docker_image_hce: ${_param:mcp_docker_registry}/mirantis/oss/hce
hce_bind_host: hce-api
diff --git a/docker/swarm/stack/janitor_monkey.yml b/docker/swarm/stack/janitor_monkey.yml
index 4793b1a..fb926e8 100644
--- a/docker/swarm/stack/janitor_monkey.yml
+++ b/docker/swarm/stack/janitor_monkey.yml
@@ -1,6 +1,5 @@
parameters:
_param:
- mcp_docker_registry: 'docker-prod-local.artifactory.mirantis.com'
docker_janitor_monkey_replicas: 1
docker_image_mongodb: library/mongo:3.4
docker_mongodb_admin_username: admin
diff --git a/docker/swarm/stack/monitoring/alerta.yml b/docker/swarm/stack/monitoring/alerta.yml
index 8c9d7aa..0f82821 100644
--- a/docker/swarm/stack/monitoring/alerta.yml
+++ b/docker/swarm/stack/monitoring/alerta.yml
@@ -2,7 +2,6 @@
- system.prometheus.alerta
parameters:
_param:
- mcp_docker_registry: 'docker-prod-local.artifactory.mirantis.com'
docker_image_alerta: ${_param:mcp_docker_registry}/mirantis/external/alerta-web:latest
alerta_mongodb_uri: "mongodb://${_param:cluster_node01_address}:27017,${_param:cluster_node02_address}:27017,${_param:cluster_node03_address}:27017/alerta?replicaSet=stacklight"
alerta_admin_username: "admin@alerta.io"
diff --git a/docker/swarm/stack/monitoring/elasticsearch_client_node.yml b/docker/swarm/stack/monitoring/elasticsearch_client_node.yml
index 2e509f1..d642dd2 100644
--- a/docker/swarm/stack/monitoring/elasticsearch_client_node.yml
+++ b/docker/swarm/stack/monitoring/elasticsearch_client_node.yml
@@ -1,6 +1,5 @@
parameters:
_param:
- mcp_docker_registry: 'docker-prod-local.artifactory.mirantis.com'
docker_image_elasticsearch: ${_param:mcp_docker_registry}/mirantis/external/elasticsearch:nightly
elasticsearch_client_node_publish_host: ${_param:cluster_public_host}
elasticsearch_cluster_name: elasticsearch
diff --git a/docker/swarm/stack/monitoring/gainsight.yml b/docker/swarm/stack/monitoring/gainsight.yml
index 5748034..06c87aa 100644
--- a/docker/swarm/stack/monitoring/gainsight.yml
+++ b/docker/swarm/stack/monitoring/gainsight.yml
@@ -2,7 +2,6 @@
- system.prometheus.gainsight.container
parameters:
_param:
- mcp_docker_registry: 'docker-prod-local.artifactory.mirantis.com'
gainsight_enabled: 'true'
gainsight_csv_upload_url: 'http://localhost:9999'
gainsight_account_id: 'default'
diff --git a/docker/swarm/stack/pushkin.yml b/docker/swarm/stack/pushkin.yml
index 65d400e..2ee26e4 100644
--- a/docker/swarm/stack/pushkin.yml
+++ b/docker/swarm/stack/pushkin.yml
@@ -1,6 +1,5 @@
parameters:
_param:
- mcp_docker_registry: 'docker-prod-local.artifactory.mirantis.com'
docker_pushkin_replicas: 1
docker_image_pushkin: ${_param:mcp_docker_registry}/mirantis/oss/pushkin
pushkin_bind_host: pushkin-api
diff --git a/docker/swarm/stack/rundeck.yml b/docker/swarm/stack/rundeck.yml
index b680eea..a1e8f5a 100644
--- a/docker/swarm/stack/rundeck.yml
+++ b/docker/swarm/stack/rundeck.yml
@@ -1,6 +1,5 @@
parameters:
_param:
- mcp_docker_registry: 'docker-prod-local.artifactory.mirantis.com'
docker_rundeck_replicas: 1
docker_image_rundeck: ${_param:mcp_docker_registry}/mirantis/oss/rundeck:latest
rundeck_bind_host: rundeck-api
diff --git a/docker/swarm/stack/security_monkey.yml b/docker/swarm/stack/security_monkey.yml
index 2c46878..5db205e 100644
--- a/docker/swarm/stack/security_monkey.yml
+++ b/docker/swarm/stack/security_monkey.yml
@@ -1,6 +1,5 @@
parameters:
_param:
- mcp_docker_registry: 'docker-prod-local.artifactory.mirantis.com'
docker_security_monkey_api_replicas: 1
docker_security_monkey_scheduler_replicas: 1
secmonkey_login_id: 11
diff --git a/jenkins/client/job/deploy/lab/deploy.yml b/jenkins/client/job/deploy/lab/deploy.yml
index 1914ec5..7e419f6 100644
--- a/jenkins/client/job/deploy/lab/deploy.yml
+++ b/jenkins/client/job/deploy/lab/deploy.yml
@@ -1,6 +1,5 @@
parameters:
_param:
- mcp_docker_registry: 'docker-prod-local.artifactory.mirantis.com'
jenkins_deploy_jobs: []
heat_stack_zone_job_param:
type: string
diff --git a/jenkins/client/job/k8s-test/mcp-k8s-metallb-test-pipeline.yml b/jenkins/client/job/k8s-test/mcp-k8s-metallb-test-pipeline.yml
index 8ebd8eb..3c75156 100644
--- a/jenkins/client/job/k8s-test/mcp-k8s-metallb-test-pipeline.yml
+++ b/jenkins/client/job/k8s-test/mcp-k8s-metallb-test-pipeline.yml
@@ -1,5 +1,6 @@
parameters:
_param:
+ # Thise is exactly in-house mirror. Please don't change it to .com
mcp_docker_registry: 'docker-dev-local.docker.mirantis.net'
jenkins:
client:
diff --git a/jenkins/client/job/validate.yml b/jenkins/client/job/validate.yml
index c0ebf40..a3eb1ee 100644
--- a/jenkins/client/job/validate.yml
+++ b/jenkins/client/job/validate.yml
@@ -2,7 +2,6 @@
_param:
jenkins_salt_api_url: "http://${_param:salt_master_host}:6969"
cvp_sanity_default_repo: "https://github.com/Mirantis/cvp-sanity-checks"
- mcp_docker_registry: 'docker-prod-local.artifactory.mirantis.com'
jenkins:
client:
view:
diff --git a/kubernetes/common/init.yml b/kubernetes/common/init.yml
index 8df430f..8028f51 100644
--- a/kubernetes/common/init.yml
+++ b/kubernetes/common/init.yml
@@ -1,6 +1,5 @@
parameters:
_param:
- mcp_docker_registry: 'docker-prod-local.artifactory.mirantis.com'
kubernetes_calico_calicoctl_repo: ${_param:mcp_docker_registry}/mirantis/projectcalico/calico
kubernetes_calico_repo: ${_param:mcp_docker_registry}/mirantis/projectcalico/calico
kubernetes_calico_cni_repo: ${_param:mcp_docker_registry}/mirantis/projectcalico/calico
diff --git a/opencontrail/control/analytics4_0.yml b/opencontrail/control/analytics4_0.yml
index b779aed..bfdbadb 100644
--- a/opencontrail/control/analytics4_0.yml
+++ b/opencontrail/control/analytics4_0.yml
@@ -6,7 +6,6 @@
- system.haproxy.proxy.listen.opencontrail.analytics
parameters:
_param:
- mcp_docker_registry: 'docker-prod-local.artifactory.mirantis.com'
opencontrail_kafka_log_cleanup_mtime: '+7'
opencontrail_kafka_log_cleanup_dir: '/usr/share/kafka/logs/'
opencontrail_version: 4.0
diff --git a/opencontrail/control/cluster4_0.yml b/opencontrail/control/cluster4_0.yml
index c97196f..acd6a0b 100644
--- a/opencontrail/control/cluster4_0.yml
+++ b/opencontrail/control/cluster4_0.yml
@@ -6,7 +6,6 @@
- system.haproxy.proxy.listen.opencontrail.analytics
parameters:
_param:
- mcp_docker_registry: 'docker-prod-local.artifactory.mirantis.com'
opencontrail_kafka_log_cleanup_mtime: '+7'
opencontrail_kafka_log_cleanup_dir: '/usr/share/kafka/logs/'
opencontrail_version: 4.0
diff --git a/opencontrail/control/control4_0.yml b/opencontrail/control/control4_0.yml
index 123392c..782e2cb 100644
--- a/opencontrail/control/control4_0.yml
+++ b/opencontrail/control/control4_0.yml
@@ -5,7 +5,6 @@
- system.haproxy.proxy.listen.opencontrail.control
parameters:
_param:
- mcp_docker_registry: 'docker-prod-local.artifactory.mirantis.com'
opencontrail_version: 4.0
linux_repo_contrail_component: oc40
opencontrail_image_tag: latest
diff --git a/opencontrail/control/single4_0.yml b/opencontrail/control/single4_0.yml
index 9826b28..1288af4 100644
--- a/opencontrail/control/single4_0.yml
+++ b/opencontrail/control/single4_0.yml
@@ -4,7 +4,6 @@
- service.haproxy.proxy.single
parameters:
_param:
- mcp_docker_registry: 'docker-prod-local.artifactory.mirantis.com'
opencontrail_kafka_log_cleanup_mtime: '+7'
opencontrail_kafka_log_cleanup_dir: '/usr/share/kafka/logs/'
opencontrail_version: 4.0
diff --git a/rundeck/client/project/cicd.yml b/rundeck/client/project/cicd.yml
index 6038fcc..e09d9f1 100644
--- a/rundeck/client/project/cicd.yml
+++ b/rundeck/client/project/cicd.yml
@@ -1,6 +1,5 @@
parameters:
_param:
- mcp_docker_registry: 'docker-prod-local.artifactory.mirantis.com'
rundeck_cis_jobs_repository: https://gerrit.mcp.mirantis.net/oss/rundeck-cis-jobs
rundeck_cis_jobs_revision: master
rundeck_cis_elasticsearch_url: yourelastic:9200