summaryrefslogtreecommitdiff
path: root/per-service
diff options
context:
space:
mode:
authorAndy Doan <andy.doan@linaro.org>2016-11-09 13:49:14 -0600
committerAndy Doan <andy.doan@linaro.org>2016-11-10 19:16:22 +0000
commite745e537cca2b963709fa4004db06e3b5c683643 (patch)
treec3d5fd3599fab2d8b369351c5daa1833b2c35b3b /per-service
parent3ee7e66259be4da581ffaaf58657beb0e16941c5 (diff)
downloadansible-playbooks-e745e537cca2b963709fa4004db06e3b5c683643.tar.gz
android git: consolidate common group variables
Each android git server has a few variables that are really common to one another. This makes it easier to manage them. Change-Id: I7dcedf9951afb2c05354bfc15b466413fa601efd Reviewed-on: https://review.linaro.org/15428 Reviewed-by: Ben Copeland <ben.copeland@linaro.org>
Diffstat (limited to 'per-service')
-rw-r--r--per-service/git-servers/group_vars/android-git9
-rw-r--r--per-service/git-servers/host_vars/android-git-ap.linaro.org8
-rw-r--r--per-service/git-servers/host_vars/android-git-ie.linaro.org8
-rw-r--r--per-service/git-servers/host_vars/android-git-us.linaro.org6
-rw-r--r--per-service/git-servers/hosts9
5 files changed, 15 insertions, 25 deletions
diff --git a/per-service/git-servers/group_vars/android-git b/per-service/git-servers/group_vars/android-git
new file mode 100644
index 0000000..9fbd01c
--- /dev/null
+++ b/per-service/git-servers/group_vars/android-git
@@ -0,0 +1,9 @@
+hosttype: git-slave
+git_master: android-git-us.linaro.org
+server_role: git-android
+gerrit_root: /srv/gerrit
+git_host: android-git.linaro.org
+host_site_name: Linaro Android Git Hosting
+
+git_bundle_blacklist: git-android-bundle-exclude.txt
+grokmirror_master: false
diff --git a/per-service/git-servers/host_vars/android-git-ap.linaro.org b/per-service/git-servers/host_vars/android-git-ap.linaro.org
index 1c36c8a..f3c920f 100644
--- a/per-service/git-servers/host_vars/android-git-ap.linaro.org
+++ b/per-service/git-servers/host_vars/android-git-ap.linaro.org
@@ -1,9 +1 @@
-hosttype: git-slave
-server_role: git-android
-git_master: android-git-us.linaro.org
-git_host: android-git.linaro.org
nickname: android-ap-git
-host_site_name: Linaro Android Git Hosting
-
-git_bundle_blacklist: git-android-bundle-exclude.txt
-grokmirror_slave: true
diff --git a/per-service/git-servers/host_vars/android-git-ie.linaro.org b/per-service/git-servers/host_vars/android-git-ie.linaro.org
index 3463d3c..60499c0 100644
--- a/per-service/git-servers/host_vars/android-git-ie.linaro.org
+++ b/per-service/git-servers/host_vars/android-git-ie.linaro.org
@@ -1,9 +1 @@
-hosttype: git-slave
-server_role: git-android
-git_master: android-git-us.linaro.org
-git_host: android-git.linaro.org
nickname: android-ie-git
-host_site_name: Linaro Android Git Hosting
-
-git_bundle_blacklist: git-android-bundle-exclude.txt
-grokmirror_slave: true
diff --git a/per-service/git-servers/host_vars/android-git-us.linaro.org b/per-service/git-servers/host_vars/android-git-us.linaro.org
index c68f333..f99adaf 100644
--- a/per-service/git-servers/host_vars/android-git-us.linaro.org
+++ b/per-service/git-servers/host_vars/android-git-us.linaro.org
@@ -1,10 +1,4 @@
hosttype: git-android
-server_role: git-android
-gerrit_root: /srv/gerrit
-git_host: android-git.linaro.org
nickname: android-git
-host_site_name: Linaro Android Git Hosting
mirror_user: ubuntu
-
-git_bundle_blacklist: git-android-bundle-exclude.txt
grokmirror_master: true
diff --git a/per-service/git-servers/hosts b/per-service/git-servers/hosts
index 52830a0..913be87 100644
--- a/per-service/git-servers/hosts
+++ b/per-service/git-servers/hosts
@@ -2,16 +2,19 @@
git-us.linaro.org
git-ap.linaro.org
git-ie.linaro.org
-android-git-us.linaro.org
-android-git-ap.linaro.org
-android-git-ie.linaro.org
dev-private-git.linaro.org
[git:children]
projectara
projectara-mdk
+android-git
#dev-private
+[android-git]
+android-git-us.linaro.org
+android-git-ap.linaro.org
+android-git-ie.linaro.org
+
[dev-private]
dev-private-git.linaro.org
dev-private-review.linaro.org