diff options
| author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2015-03-17 18:21:20 +0000 |
|---|---|---|
| committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2015-03-17 18:53:25 +0000 |
| commit | b69dc4572ac29ddabd30637685242f7b5505322d (patch) | |
| tree | b24ca901409ae5ea3b21abd11fa9bc25f159fa61 | |
| parent | c80c140c345d0ba6a49148d10270873c720a297f (diff) | |
| download | infrastructure-b69dc4572ac29ddabd30637685242f7b5505322d.tar.gz | |
Use unqualified hostnames for Ansible 'hosts'
This makes the deployment scripts a bit more generic. Now, if I want to
deploy 'gerrit.example.com', I don't need to fix all the places that
say 'hosts: gerrit.baserock.org' to say 'hosts: gerrit.example.com'
instead.
| -rw-r--r-- | baserock_gerrit/instance-config.yml | 2 | ||||
| -rw-r--r-- | baserock_gerrit/instance-mirroring-config.yml | 2 | ||||
| -rw-r--r-- | baserock_hosts | 23 | ||||
| -rw-r--r-- | baserock_openid_provider/instance-config.yml | 2 |
4 files changed, 14 insertions, 15 deletions
diff --git a/baserock_gerrit/instance-config.yml b/baserock_gerrit/instance-config.yml index f9317278..dc27f8f8 100644 --- a/baserock_gerrit/instance-config.yml +++ b/baserock_gerrit/instance-config.yml @@ -6,7 +6,7 @@ # Download it from here: # <http://www.oracle.com/technetwork/java/javase/downloads/jre8-downloads-2133155.html> # -- hosts: gerrit.baserock.org +- hosts: gerrit gather_facts: False vars: GERRIT_VERSION: 2.9.4 diff --git a/baserock_gerrit/instance-mirroring-config.yml b/baserock_gerrit/instance-mirroring-config.yml index 6864f7c7..a0130d22 100644 --- a/baserock_gerrit/instance-mirroring-config.yml +++ b/baserock_gerrit/instance-mirroring-config.yml @@ -1,4 +1,4 @@ -- hosts: gerrit.baserock.org +- hosts: gerrit gather_facts: no sudo: yes tasks: diff --git a/baserock_hosts b/baserock_hosts index 0101909f..03556251 100644 --- a/baserock_hosts +++ b/baserock_hosts @@ -8,26 +8,25 @@ [baserock] baserock-mason-x86-64 ansible_ssh_host=192.168.222.48 -cache.baserock.org ansible_ssh_host=192.168.222.14 +cache 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 +gerrit ansible_ssh_host=192.168.222.69 +git ansible_ssh_host=192.168.222.58 +irclogs ansible_ssh_host=192.168.222.74 +#mason-armv7lhf ansible_ssh_host=192.168.222.15 +mason-x86-32 ansible_ssh_host=192.168.222.81 +mason-x86-64 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 +openid ansible_ssh_host=192.168.222.67 +storyboard 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 +paste ansible_ssh_host=192.168.222.6 +#testgerrit ansible_ssh_host=192.168.222.46 [baserock:vars] diff --git a/baserock_openid_provider/instance-config.yml b/baserock_openid_provider/instance-config.yml index 600925b2..7eac185d 100644 --- a/baserock_openid_provider/instance-config.yml +++ b/baserock_openid_provider/instance-config.yml @@ -3,7 +3,7 @@ # This playbook should be run after starting an instance of the Baserock # OpenID Provider image. --- -- hosts: openid.baserock.org +- hosts: openid gather_facts: False sudo: yes tasks: |