Merge pull request #39 from Diesel-Net/development

Promotion

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

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

.ansible/update.yaml → .ansible/maintain.yaml

@@ -8,3 +8,7 @@
     - import_role:
         name: ubuntu
         tasks_from: update
+
+    - import_role:
+        name: docker
+        tasks_from: system_prune

.ansible/roles/requirements.deploy.yaml → .ansible/roles/requirements.yaml

@@ -11,4 +11,4 @@
 - name: docker
   scm: git
   src: "[email protected]:Diesel-Net/ansible-role-docker.git"
-  version: 1.3.0
+  version: 1.4.0

.drone.yaml

@@ -1,7 +1,7 @@
 ---
 kind: pipeline
 type: docker
-name: main deployment pipeline
+name: swarm bootstrap
 
 clone:
   depth: 1
@@ -18,7 +18,7 @@ steps:
         from_secret: super_pass
     settings:
       requirements: .ansible/files/requirements.txt
-      galaxy: .ansible/roles/requirements.deploy.yaml
+      galaxy: .ansible/roles/requirements.yaml
       playbook: .ansible/deploy.yaml
       private_key:
         from_secret: automation_id_rsa
@@ -48,39 +48,39 @@ clone:
   depth: 1
 
 steps:
-  - name: Update development server(s)
+  - name: running maintenance tasks on development server(s)
     image: plugins/ansible:3
     environment:
       ANSIBLE_CONFIG: .ansible/ansible.cfg
     settings:
-      galaxy: .ansible/roles/requirements.update.yaml
-      playbook: .ansible/update.yaml
+      galaxy: .ansible/roles/requirements.yaml
+      playbook: .ansible/maintain.yaml
       inventory: .ansible/inventory/development
       private_key:
         from_secret: automation_id_rsa
       vault_password:
         from_secret: ansible_vault_password
 
-  - name: Update test server(s)
+  - name: running maintenance tasks on test server(s)s
     image: plugins/ansible:3
     environment:
       ANSIBLE_CONFIG: .ansible/ansible.cfg
     settings:
-      galaxy: .ansible/roles/requirements.update.yaml
-      playbook: .ansible/update.yaml
+      galaxy: .ansible/roles/requirements.yaml
+      playbook: .ansible/maintain.yaml
       inventory: .ansible/inventory/stable
       private_key:
         from_secret: automation_id_rsa
       vault_password:
         from_secret: ansible_vault_password
 
-  - name: Update production server(s)
+  - name: running maintenance tasks on production server(s)
     image: plugins/ansible:3
     environment:
       ANSIBLE_CONFIG: .ansible/ansible.cfg
     settings:
-      galaxy: .ansible/roles/requirements.update.yaml
-      playbook: .ansible/update.yaml
+      galaxy: .ansible/roles/requirements.yaml
+      playbook: .ansible/maintain.yaml
       inventory: .ansible/inventory/production
       private_key:
         from_secret: automation_id_rsa
@@ -91,5 +91,37 @@ trigger:
   event:
     - cron
   cron:
-    - daily_updates
+    - daily_maintenance
+# ---
+
+# kind: pipeline
+# type: docker
+# name: daily maintenance (test)
+
+# clone:
+#   depth: 1
+
+# steps:
+
+#   - name: Running maintenance tasks on development server(s)
+#     image: plugins/ansible:3
+#     environment:
+#       ANSIBLE_CONFIG: .ansible/ansible.cfg
+#     settings:
+#       galaxy: .ansible/roles/requirements.yaml
+#       playbook: .ansible/maintain.yaml
+#       inventory: .ansible/inventory/development
+#       private_key:
+#         from_secret: automation_id_rsa
+#       vault_password:
+#         from_secret: ansible_vault_password
+
+# depends_on: 
+#   - swarm bootstrap
+
+# trigger:
+#   event:
+#     - push
+#   branch:
+#     - development
 ...