Merge pull request #18 from Diesel-Net/development

Resolves #9

.ansible/inventory/development/group_vars/all/main.yaml

@@ -1 +1,2 @@
-env: "dev"
+env: dev
+auto_reboots: yes

.ansible/inventory/production/group_vars/all/main.yaml

@@ -1 +1,2 @@
-env: "prod"
+env: prod
+auto_reboots: no

.ansible/inventory/stable/group_vars/all/main.yaml

@@ -1 +1,2 @@
-env: "test"
+env: test
+auto_reboots: yes

.ansible/roles/requirements.update.yaml

@@ -0,0 +1,4 @@
+- name: ubuntu_base
+  scm: git
+  src: "[email protected]:Diesel-Net/ansible-role-ubuntu-base.git"
+  version: 1.2.0

.ansible/update.yaml

@@ -0,0 +1,10 @@
+# ansible-galaxy install -r .ansible/roles/requirements.update.yaml -p .ansible/roles --force
+# ansible-playbook .ansible/update.yaml -i .ansible/inventory/development/hosts --vault-id ~/.tokens/master_id
+
+- hosts: all 
+  strategy: free
+  tasks:
+
+    - import_role:
+        name: ubuntu_base
+        tasks_from: update

.drone.yaml

@@ -1,7 +1,7 @@
 ---
 kind: pipeline
 type: docker
-name: development pipeline
+name: main deployment pipeline
 
 clone:
   depth: 1
@@ -18,11 +18,16 @@ steps:
     settings:
       galaxy: .ansible/roles/requirements.ssh.yaml
       playbook: .ansible/configure_ssh.yaml
-      inventory: .ansible/inventory/development/hosts
       private_key:
         from_secret: ansible_private_key
       vault_password:
-        from_secret: ansible_vault_password 
+        from_secret: ansible_vault_password
+    commands:
+      # dynamically select inventory based on Git branch/tag
+      - version=$DRONE_BRANCH
+      - if [ ! -z $DRONE_TAG ]; then version=production; fi
+      - /bin/drone-ansible --inventory .ansible/inventory/$$version/hosts
+
 
   - name: deploy
     image: plugins/ansible:3
@@ -31,105 +36,76 @@ steps:
     settings:
       galaxy: .ansible/roles/requirements.deploy.yaml
       playbook: .ansible/deploy.yaml
-      inventory: .ansible/inventory/development/hosts
       private_key:
         from_secret: ansible_private_key
       vault_password:
         from_secret: ansible_vault_password 
+    commands:
+      # dynamically select inventory based on Git branch/tag
+      - version=$DRONE_BRANCH
+      - if [ ! -z $DRONE_TAG ]; then version=production; fi
+      - /bin/drone-ansible --inventory .ansible/inventory/$$version/hosts
 
 trigger:
   branch:
     - development
+    - stable
   event:
     - push
+    - tag
 
 ---
+
 kind: pipeline
 type: docker
-name: test pipeline
+name: daily updates pipeline
 
 clone:
   depth: 1
 
 steps:
-  - name: configure ssh
+  - name: Update development server(s)
     image: plugins/ansible:3
     environment:
       ANSIBLE_CONFIG: .ansible/ansible.cfg
-      SUPER_USER:
-        from_secret: super_user
-      SUPER_PASS:
-        from_secret: super_pass
     settings:
-      galaxy: .ansible/roles/requirements.ssh.yaml
-      playbook: .ansible/configure_ssh.yaml
-      inventory: .ansible/inventory/stable/hosts
+      galaxy: .ansible/roles/requirements.update.yaml
+      playbook: .ansible/update.yaml
+      inventory: .ansible/inventory/development
       private_key:
         from_secret: ansible_private_key
       vault_password:
-        from_secret: ansible_vault_password 
-
-  - name: deploy
-    image: plugins/ansible:3
-    environment:
-      ANSIBLE_CONFIG: .ansible/ansible.cfg
-    settings:
-      galaxy: .ansible/roles/requirements.deploy.yaml
-      playbook: .ansible/deploy.yaml
-      inventory: .ansible/inventory/stable/hosts
-      private_key:
-        from_secret: ansible_private_key
-      vault_password:
-        from_secret: ansible_vault_password 
-
-
-trigger:
-  branch:
-    - stable
-  event:
-    - push
-
----
-kind: pipeline
-type: docker
-name: production pipeline
+        from_secret: ansible_vault_password
 
-clone:
-  depth: 1
-
-steps:
-  - name: configure ssh
+  - name: Update test server(s)
     image: plugins/ansible:3
     environment:
       ANSIBLE_CONFIG: .ansible/ansible.cfg
-      SUPER_USER:
-        from_secret: super_user
-      SUPER_PASS:
-        from_secret: super_pass
     settings:
-      galaxy: .ansible/roles/requirements.ssh.yaml
-      playbook: .ansible/configure_ssh.yaml
-      inventory: .ansible/inventory/production/hosts
+      galaxy: .ansible/roles/requirements.update.yaml
+      playbook: .ansible/update.yaml
+      inventory: .ansible/inventory/stable
       private_key:
         from_secret: ansible_private_key
       vault_password:
-        from_secret: ansible_vault_password 
+        from_secret: ansible_vault_password
 
-  - name: deploy
+  - name: Update production server(s)
     image: plugins/ansible:3
     environment:
       ANSIBLE_CONFIG: .ansible/ansible.cfg
     settings:
-      galaxy: .ansible/roles/requirements.deploy.yaml
-      playbook: .ansible/deploy.yaml
-      inventory: .ansible/inventory/production/hosts
+      galaxy: .ansible/roles/requirements.update.yaml
+      playbook: .ansible/update.yaml
+      inventory: .ansible/inventory/production
       private_key:
         from_secret: ansible_private_key
       vault_password:
-        from_secret: ansible_vault_password 
-
+        from_secret: ansible_vault_password
 
 trigger:
   event:
-    - tag
+    - cron
+  cron:
+    - daily-updates
 ...