Merge remote-tracking branch 'origin/master' into 5-2-update-dock-init-and-charon

Author: Henry Mollman

ansible/delta-hosts/hosts

@@ -37,6 +37,9 @@ delta-consul-c
 [user-vault]
 localhost
 
+[user-local]
+localhost
+
 [worker]
 localhost
 

ansible/delta-hosts/variables

@@ -178,6 +178,7 @@ cream_stripe_publishable_key=pk_live_5yYYZlYIwY3LwvKFaXY0jNlm
 datadog_mongodb_pwd=sqa3WBgkCgZsFZuex0kBNahZ
 datadog_mongodb_user=datadog
 datadog_tags=env:delta
+dock_vault_user_creation_access_token=ddf20c34-019c-5b24-9c0d-1b44e3edf29a
 domain=runnable.io
 env=delta
 github_domain=api.github.com
@@ -193,18 +194,18 @@ pg_pass=59a5524e-a772-11e5-bedc-1bdc0db458b3
 pg_port=5432
 rabbit_host_address=10.8.4.195
 rabbit_password=wKK7g7NWKpQXEeSzyWB7mIpxZIL8H2mDSf3Q6czR3Vk
+rabbit_port=54321
 rabbit_username=o2mdLh9N9Ke2GzhoK8xsruYPhIQFN7iEL44dQJoq7OM
 redis_host_address=10.8.4.9
+registry_token=4PX2AU9QIJSCDLZEXILYX6ZP2RCXY1HR10WVZKWVR0JW8DS5IIY87D96V0RACMK5
+registry_username=runnable+deltapush
 secrets_path=delta-hosts/secrets
 user_content_domain=runnableapp.com
+user_vault_load_balancer=ab5d35e6f344211e797770ac76ff2aaa-2031464484.us-west-2.elb.amazonaws.com
 vault_auth_token=578c9767-5af8-8490-0954-5d330f27b088
 vault_token_01=0d324dc7d4cbd94790fd08809d06fb1e28e21e185910081c7646e3e49924f6ed01
 vault_token_02=42dc8a69df174e77eb47a63b6ef4709bec57101cb1bff11a71c91b73b8bc046102
 vault_token_03=47f3cb74f5374fa3c51c90fd25e3d4cc851034de97584995fce5fc5382342f1f03
-rabbit_port=54321
-registry_username=runnable+deltapush
-registry_token=4PX2AU9QIJSCDLZEXILYX6ZP2RCXY1HR10WVZKWVR0JW8DS5IIY87D96V0RACMK5
-dock_vault_user_creation_access_token=ddf20c34-019c-5b24-9c0d-1b44e3edf29a
 
 [web:vars]
 web_intercom_id=wqzm3rju

ansible/gamma-hosts/hosts

@@ -41,6 +41,9 @@ gamma-consul-c
 [user-vault]
 localhost
 
+[user-local]
+localhost
+
 [worker]
 localhost
 

ansible/gamma-hosts/variables

@@ -161,6 +161,7 @@ cream_stripe_publishable_key=pk_test_sHr5tQaPtgwiE2cpW6dQkzi8
 datadog_mongodb_pwd=sqa3WBgkCgZsFZuex0kBNahZ
 datadog_mongodb_user=datadog
 datadog_tags=env:gamma
+dock_vault_user_creation_access_token=137f441f-db71-40a2-8448-10a565323b1e
 domain=runnable-gamma.com
 env=gamma
 github_domain=api.github.com
@@ -176,15 +177,15 @@ pg_port=32659
 rabbit_password=wKK7g7NWKpQXEeSzyWB7mIpxZIL8H2mDSf3Q6czR3Vk
 rabbit_username=o2mdLh9N9Ke2GzhoK8xsruYPhIQFN7iEL44dQJoq7OM
 redis_host_address=10.4.6.45
+registry_token=8G0NT1HZQZHYXU7OB1QAI8HA1560V6R68DE6R6B8YJWQAED82JAFCD057ZWIDT76
+registry_username=runnable+gamma
 secrets_path=gamma-hosts/secrets
 user_content_domain=runnablecloud.com
+user_vault_load_balancer=aa8364af12f5a11e7bb9e02301ded9ea-905956029.us-west-2.elb.amazonaws.com
 vault_auth_token=f9a39e92-99f3-66a0-a27d-a6e07717d30d
 vault_token_01=2c0be2adf99931bc9ed443000e87bbcd0ef096dddc79f6add97ebe8fa7e93d2c05
 vault_token_02=3489b87c913058740537bbbd4503f3720d74f7cb0f4e0c30a9436e1e52a18d7003
 vault_token_03=ac4e1e9800cbf77283298d08172a2f0e46d0b7cbc457c47788d04768af12584a02
-registry_username=runnable+gamma
-registry_token=8G0NT1HZQZHYXU7OB1QAI8HA1560V6R68DE6R6B8YJWQAED82JAFCD057ZWIDT76
-dock_vault_user_creation_access_token=137f441f-db71-40a2-8448-10a565323b1e
 
 [web:vars]
 web_intercom_id=xs5g95pd

ansible/group_vars/alpha-image-builder.yml

@@ -1,8 +1,7 @@
 app_name: image-builder
 name: "{{ app_name }}"
-# namespace (can include "registry.runnable.com:")
-image_builder_docker_namespace: "{{ registry_host }}/runnable/image-builder"
-app_repo: git@github.com:CodeNow/{{ app_name }}.git
+
+repo: git@github.com:CodeNow/{{ name }}.git
 
 # consul values
 consul_values:

ansible/group_vars/alpha-user-vault.yml

@@ -4,6 +4,8 @@ container_image: vault
 container_tag: 0.7.0
 hosted_ports: ["{{ user_vault_port }}"]
 
+service_type: "LoadBalancer"
+
 volume_mounts:
  - name: "{{ name }}"
    path: /config

ansible/image-builder.yml

@@ -1,10 +1,13 @@
 ---
+- hosts: user-local
+  vars_files:
+    - group_vars/alpha-image-builder.yml
+  roles:
+  - { role: build_with_dockerfile }
+
 - hosts: "{{ dock | default('docks') }}"
   vars_files:
     - group_vars/alpha-image-builder.yml
   roles:
-  - { role: notify, tags: [notify] }
-  - { role: node, tags: [setup]  }
-  - { role: git_repo }
-  - { role: image-builder }
+  - { role: pull-image }
   - { role: consul_value, tags: [consul_value] }

ansible/roles/build_with_dockerfile/tasks/main.yml

@@ -30,9 +30,20 @@
   become: yes
   command: docker build {{ build_args | default("") }} --tag="{{ container_image }}:{{ container_tag }}" "{{ build_dir }}/{{ name }}/repo"
 
+- name: login to registry
+  delegate_to: "{{ builder }}"
+  tags: deploy, build
+  become: yes
+  command: docker login -u {{ registry_username }} -p {{ registry_token }} -e "info@runnable.com" {{ registry_host }}
+
 - name: push docker image
   delegate_to: "{{ builder }}"
   tags: deploy, build
   become: yes
-  ignore_errors: True
   command: docker push {{ container_image }}:{{ container_tag }}
+
+- name: logout of registry
+  delegate_to: "{{ builder }}"
+  tags: deploy, build
+  become: yes
+  command: docker logout {{ registry_host }}

ansible/roles/builder/tasks/main.yml

@@ -31,6 +31,7 @@
 - name: set number of images built
   tags: deploy, build
   set_fact:
+    # Quay IO includes deleted images in this query through the `end_ts` property
     no_images_found: "{{ currently_built_tags|json_query('json.tags')|length == 0  }}"
 
 - name: set number of images built
@@ -192,4 +193,4 @@
   tags: deploy, build
   when: build_image
   become: yes
-  command: docker logout
+  command: docker logout {{ registry_host }}