aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Sokolovsky <paul.sokolovsky@linaro.org>2013-11-28 23:58:06 +0200
committerPaul Sokolovsky <paul.sokolovsky@linaro.org>2013-11-28 23:58:06 +0200
commitba55b15480130af6eb3022fea907fabb5befdec5 (patch)
tree26847cc0f54e9a2cbeb5d3c9e64fb86f2f7f6578
parenta0caff586f5d418d193069771448f38df7f3fbd0 (diff)
downloadl-a-b-VPS-ba55b15480130af6eb3022fea907fabb5befdec5.tar.gz
Refactor host inventory per latest ideas.
-rw-r--r--ansible-deploy/hosts-devel19
-rw-r--r--ansible-deploy/hosts-prod11
2 files changed, 17 insertions, 13 deletions
diff --git a/ansible-deploy/hosts-devel b/ansible-deploy/hosts-devel
index 91215d5..a0b73d0 100644
--- a/ansible-deploy/hosts-devel
+++ b/ansible-deploy/hosts-devel
@@ -2,7 +2,11 @@
localhost:2222
[ec2-devel]
-ec2-54-196-47-13.compute-1.amazonaws.com
+#ec2-54-196-47-13.compute-1.amazonaws.com
+ec2-174-129-179-83.compute-1.amazonaws.com
+
+[ec2:children]
+ec2-devel
[devel:children]
vagrant
@@ -11,15 +15,10 @@ ec2-devel
[android-build:children]
devel
-[jenkins-generic:children]
-android-build
-devel
-
-[ec2:children]
-ec2-devel
-
[rdk-ci:children]
devel
-[rdk-ci:vars]
-site_name = rdk.ci.linaro.org
+[jenkins-generic:children]
+android-build
+rdk-ci
+
diff --git a/ansible-deploy/hosts-prod b/ansible-deploy/hosts-prod
index 3dcb1a6..a990dd6 100644
--- a/ansible-deploy/hosts-prod
+++ b/ansible-deploy/hosts-prod
@@ -1,15 +1,20 @@
[android-build]
android-build.linaro.org
-[jenkins-generic]
-ci.linaro.org
+[rdk-ci]
rdk.ci.linaro.org
+
+[ci]
+ci.linaro.org
+
+# All individual services are based on jenkins-generic
[jenkins-generic:children]
android-build
+rdk-ci
+ci
# Superset of all services
[production:children]
-android-build
jenkins-generic
# All production sites are ec2