imfreedom/bamboo-terraform

hgignore updates, clean up the variables, and switch from using ssh -J to use ssh -o ProxyJump
draft
2019-05-25, Gary Kramlich
769cb2f0d86c
Parents 229f9016ca73
Children e58899dfbce8
hgignore updates, clean up the variables, and switch from using ssh -J to use ssh -o ProxyJump
6 files changed, 16 insertions(+), 17 deletions(-)
  • +6 -1
    .hgignore
  • +8 -0
    ansible/vars/secrets.yml
  • +0 -3
    ansible/vars/vars.yml
  • +0 -9
    ansible/vars/vault
  • +1 -3
    ansible/worker.yml
  • +1 -1
    instance-worker.tf
    • --- a/.hgignore Sat May 25 21:22:40 2019 -0500
    +++ b/.hgignore Sat May 25 21:58:37 2019 -0500
    @@ -5,5 +5,10 @@
    syntax: regexp
    \.terraform\/
    -nodes\/
    +\.terraform\.tfstate\.lock\.info
    +^ansible\.zip$
    +^ansible\/.+\.retry$
    +^hosts\.workers$
    +^nodes\/
    +^secrets\/
    --- /dev/null Thu Jan 01 00:00:00 1970 +0000
    +++ b/ansible/vars/secrets.yml Sat May 25 21:58:37 2019 -0500
    @@ -0,0 +1,8 @@
    +$ANSIBLE_VAULT;1.1;AES256
    +36636330313966343734336431323931363536313461306633393331353864376362353737353866
    +6561386465646533366534396630656432393662363065310a383631383337376231316365623732
    +32326161623737393463396635643665353732333734373461316164343636383531386433336665
    +6433343337343361620a313139303435616565363566663236316638623663326663643437313430
    +37303932616663633263663666326436656430633661323761613234393731643539633733373864
    +66623465396265376161373838336166643166626232346662303537336533346365316666363332
    +623637366236393931663731346531333464
    --- a/ansible/vars/vars.yml Sat May 25 21:22:40 2019 -0500
    +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
    @@ -1,3 +0,0 @@
    ----
    -bamboo_token: "{{ vault_bamboo_token }}"
    -
    --- a/ansible/vars/vault Sat May 25 21:22:40 2019 -0500
    +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
    @@ -1,9 +0,0 @@
    -$ANSIBLE_VAULT;1.1;AES256
    -36373762363335306333323435306331323432343462336634373130313634616464323563363634
    -3735323433333033306462653431373735323162626138390a346264386232623065633965346262
    -33353931313037386438363765666264343066306134626338633432383434366563353732653462
    -6633373464383635640a643839656639353564376233386531313730616134326633643764666134
    -33396466613066383233306661643461613537653464313765346662323638363765363635333135
    -35393336643631306237666162636130363237623866646336343665303536386565653164666364
    -31316430393632363839663630663963373965313031316261396337376637396265373337373737
    -30643631326330336338
    --- a/ansible/worker.yml Sat May 25 21:22:40 2019 -0500
    +++ b/ansible/worker.yml Sat May 25 21:58:37 2019 -0500
    @@ -1,8 +1,7 @@
    ---
    - hosts: all
    vars_files:
    - - vars/vars.yml
    - - vars/vault
    + - vars/secrets.yml
    roles:
    - role: rwgrim.docker
    - role: rwgrim.convey
    @@ -12,4 +11,3 @@
    bamboo_server: https://bamboo.pidgin.im/
    bamboo_version: 6.8.0
    bamboo_groups: docker
    - bamboo_token: "{{ vault_bamboo_token }}"
    --- a/instance-worker.tf Sat May 25 21:22:40 2019 -0500
    +++ b/instance-worker.tf Sat May 25 21:58:37 2019 -0500
    @@ -82,7 +82,7 @@
    resource "local_file" "worker_hosts" {
    count = "${var.worker_count > 0 ? 1 : 0 }"
    - content = "${join("\n", formatlist("%s ansible_ssh_common_args='-J %s -o StrictHostKeyChecking=off' ansible_user=root ansible_host=%s", libvirt_domain.worker.*.name, replace(replace(var.libvirt_uri, "qemu+ssh://", ""), "/system", ""), flatten(libvirt_domain.worker.*.network_interface.0.addresses)))}"
    + content = "${join("\n", formatlist("%s ansible_ssh_common_args='-o ProxyJump=%s -o StrictHostKeyChecking=off' ansible_user=root ansible_host=%s", libvirt_domain.worker.*.name, replace(replace(var.libvirt_uri, "qemu+ssh://", ""), "/system", ""), flatten(libvirt_domain.worker.*.network_interface.0.addresses)))}"
    filename = "${path.module}/hosts.workers"
    }