Merge pull request #11 from Diesel-Net/development

Promotion

Author: tomdaley92

.ansible/ansible.cfg

@@ -1,13 +1,12 @@
-# ansible-playbook deploy.yaml -i inventories/dev/hosts --vault-id ~/.tokens/master_id
-
 - hosts: all
   roles:
-    - common
+    - application
+    - traefik
 
   tasks:
 
     - include_role:
-        name: common
+        name: application
         tasks_from: make_config_dir
 
     - name: 'Ensure {{ config_dir }}/config/ exists'
@@ -66,15 +65,15 @@
         dest: '{{ config_dir }}/secrets/password'
         mode: 'u=rwx,g=rwx,o=rwx'
 
-    - name: 'Render ca.json.j2 to {{ config_dir }}/config/ca.json'
+    - name: 'Render ca.json to {{ config_dir }}/config/ca.json'
       template:
-        src: ca.json.j2
+        src: ca.json
         dest: '{{ config_dir }}/config/ca.json'
         mode: 'u=rwx,g=rwx,o=rwx'
 
-    - name: 'Render defaults.json.j2 to {{ config_dir }}/config/defaults.json'
+    - name: 'Render defaults.json to {{ config_dir }}/config/defaults.json'
       template:
-        src: defaults.json.j2
+        src: defaults.json
         dest: '{{ config_dir }}/config/defaults.json'
         mode: 'u=rwx,g=rwx,o=rwx'
 

.ansible/deploy.yaml

@@ -1,5 +1,3 @@
-env: prod
-
 domain: ca.diesel.net
 fingerprint: c4dfdfdece152139fe58280eebaa142ef25b0a19f0984ca5e5338d0d8522f7d8
 

…ies/production/group_vars/all/certs.yaml …ventories/prod/group_vars/all/certs.yaml.ansible/inventories/production/group_vars/all/certs.yaml renamed to .ansible/inventories/prod/group_vars/all/certs.yaml .ansible/inventories/production/group_vars/all/certs.yaml renamed to .ansible/inventories/prod/group_vars/all/certs.yaml

@@ -1,8 +1,10 @@
 all:
   children:
-    tools:
+
+    swarm_manager:
       hosts:
-        tools.diesel.net
+        tools.diesel.net:
+
   vars:
     ansible_user: automation
     ansible_python_interpreter: /usr/bin/python3

…es/production/group_vars/all/config.yaml …entories/prod/group_vars/all/config.yaml.ansible/inventories/production/group_vars/all/config.yaml renamed to .ansible/inventories/prod/group_vars/all/config.yaml .ansible/inventories/production/group_vars/all/config.yaml renamed to .ansible/inventories/prod/group_vars/all/config.yaml

@@ -1,9 +1,14 @@
-- name: common
+- name: application
   scm: git
-  src: "git@github.com:Diesel-Net/ansible-role-common.git"
-  version: 1.1.0
+  src: "git@github.com:Diesel-Net/ansible-role-application.git"
+  version: 2.0.0
 
 - name: docker
   scm: git
   src: "git@github.com:Diesel-Net/ansible-role-docker.git"
-  version: 1.3.0
+  version: 2.0.0
+
+- name: traefik
+  scm: git
+  src: "git@github.com:Diesel-Net/ansible-role-traefik.git"
+  version: 2.0.0

.ansible/inventories/production/hosts .ansible/inventories/prod/hosts.ansible/inventories/production/hosts renamed to .ansible/inventories/prod/hosts

@@ -7,10 +7,10 @@ services:
     image: smallstep/step-ca:0.16.0
     volumes:
       - /etc/localtime:/etc/localtime
-      - {{ ssl_cert_dir }}/:/etc/ssl/certs/
+      - /etc/ssl/certs/:/etc/ssl/certs/
       - {{ config_dir }}/:/home/step/
     networks:
-      - {{ docker_network }}
+      - {{ traefik_network }}
     #environment:
       #- STEPDEBUG=1
     deploy:
@@ -20,6 +20,6 @@ services:
         - traefik.tcp.routers.{{ git_repository }}.rule=HostSNI(`{{ domain }}`)
         - traefik.tcp.routers.{{ git_repository }}.tls.passthrough=true
 networks:
-  {{ docker_network }}:
+  {{ traefik_network }}:
     external:
-      name: {{ docker_network }}
+      name: {{ traefik_network }}

.ansible/roles/requirements.yaml

@@ -1,26 +1,26 @@
 ---
 kind: pipeline
 type: docker
-name: Install Step CA Server
+name: Install Step CA Server (prod)
 
 clone:
   depth: 1
 
+concurrency:
+  limit: 1
+
 steps:
 
   - name: deploy
-    image: plugins/ansible:3
-    environment:
-      ANSIBLE_CONFIG: .ansible/ansible.cfg
+    image: docker.nexus.diesel.net/drone-ansible:2.13
     settings:
       galaxy: .ansible/roles/requirements.yaml
-      inventory: .ansible/inventories/production
+      inventory: .ansible/inventories/prod
       playbook: .ansible/deploy.yaml
       private_key:
         from_secret: automation_id_rsa
       vault_password:
         from_secret: ansible_vault_password 
-      extra_vars: version=production
 
 trigger:
   branch: