summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam Thursfield <sam.thursfield@codethink.co.uk>2015-03-17 16:12:56 +0000
committerSam Thursfield <sam.thursfield@codethink.co.uk>2015-03-17 18:15:01 +0000
commitc80c140c345d0ba6a49148d10270873c720a297f (patch)
treef2a5e691c25b19c1f0f2c7a852ceec04a40336bf
parent19a1faaa601e2258b3a3751be350eb5238cc3193 (diff)
downloadinfrastructure-c80c140c345d0ba6a49148d10270873c720a297f.tar.gz
Make 'hosts' a symlink to baserock_hosts
The idea is to make it easier for people to fork infrastructure.git and use it for their own infrastructure. They'll need to totally change 'hosts' to point to their own systems, and this would lead to merge conflicts every time they tried to pull in 'master' of infrastructure.git.
-rw-r--r--baserock_hosts40
l---------[-rw-r--r--]hosts41
2 files changed, 41 insertions, 40 deletions
diff --git a/baserock_hosts b/baserock_hosts
new file mode 100644
index 00000000..0101909f
--- /dev/null
+++ b/baserock_hosts
@@ -0,0 +1,40 @@
+# Ansible hosts file for Baserock infrastructure.
+# See: <http://docs.ansible.com/intro_inventory.html>.
+
+# We don't have DNS working for instances in the OpenStack cloud we use, which
+# makes this file a lot more fiddly than it would be otherwise. Access to these
+# machines works because the `ansible.cfg` file in the same directory redirects
+# all SSH access through the frontend machine.
+
+[baserock]
+baserock-mason-x86-64 ansible_ssh_host=192.168.222.48
+cache.baserock.org ansible_ssh_host=192.168.222.14
+devel-system-64b ansible_ssh_host=192.168.222.41
+firehose ansible_ssh_host=192.168.222.45
+gerrit.baserock.org ansible_ssh_host=192.168.222.69
+git.baserock.org ansible_ssh_host=192.168.222.58
+gerrit.baserock.org ansible_ssh_host=192.168.222.69
+irclogs.baserock.org ansible_ssh_host=192.168.222.74
+#mason-armv7lhf.baserock.org ansible_ssh_host=192.168.222.15
+mason-x86-32.baserock.org ansible_ssh_host=192.168.222.81
+mason-x86-64.baserock.org ansible_ssh_host=192.168.222.80
+
+[fedora]
+frontend-haproxy ansible_ssh_host=185.43.218.170
+database-mariadb ansible_ssh_host=192.168.222.30
+openid.baserock.org ansible_ssh_host=192.168.222.67
+storyboard.baserock.org ansible_ssh_host=192.168.222.40
+
+[ubuntu]
+paste.baserock.org ansible_ssh_host=192.168.222.6
+#testgerrit.baserock.org ansible_ssh_host=192.168.222.46
+
+
+[baserock:vars]
+ansible_ssh_user=root
+
+[ubuntu:vars]
+ansible_ssh_user=ubuntu
+
+[fedora:vars]
+ansible_ssh_user=fedora
diff --git a/hosts b/hosts
index 0101909f..c6d24b13 100644..120000
--- a/hosts
+++ b/hosts
@@ -1,40 +1 @@
-# Ansible hosts file for Baserock infrastructure.
-# See: <http://docs.ansible.com/intro_inventory.html>.
-
-# We don't have DNS working for instances in the OpenStack cloud we use, which
-# makes this file a lot more fiddly than it would be otherwise. Access to these
-# machines works because the `ansible.cfg` file in the same directory redirects
-# all SSH access through the frontend machine.
-
-[baserock]
-baserock-mason-x86-64 ansible_ssh_host=192.168.222.48
-cache.baserock.org ansible_ssh_host=192.168.222.14
-devel-system-64b ansible_ssh_host=192.168.222.41
-firehose ansible_ssh_host=192.168.222.45
-gerrit.baserock.org ansible_ssh_host=192.168.222.69
-git.baserock.org ansible_ssh_host=192.168.222.58
-gerrit.baserock.org ansible_ssh_host=192.168.222.69
-irclogs.baserock.org ansible_ssh_host=192.168.222.74
-#mason-armv7lhf.baserock.org ansible_ssh_host=192.168.222.15
-mason-x86-32.baserock.org ansible_ssh_host=192.168.222.81
-mason-x86-64.baserock.org ansible_ssh_host=192.168.222.80
-
-[fedora]
-frontend-haproxy ansible_ssh_host=185.43.218.170
-database-mariadb ansible_ssh_host=192.168.222.30
-openid.baserock.org ansible_ssh_host=192.168.222.67
-storyboard.baserock.org ansible_ssh_host=192.168.222.40
-
-[ubuntu]
-paste.baserock.org ansible_ssh_host=192.168.222.6
-#testgerrit.baserock.org ansible_ssh_host=192.168.222.46
-
-
-[baserock:vars]
-ansible_ssh_user=root
-
-[ubuntu:vars]
-ansible_ssh_user=ubuntu
-
-[fedora:vars]
-ansible_ssh_user=fedora
+baserock_hosts \ No newline at end of file