diff --git a/.ansible/inventory/production/group_vars/all/main.yaml b/.ansible/inventory/production/group_vars/all/main.yaml index dc630db..7217692 100644 --- a/.ansible/inventory/production/group_vars/all/main.yaml +++ b/.ansible/inventory/production/group_vars/all/main.yaml @@ -1,2 +1,2 @@ env: prod -auto_reboots: no +auto_reboots: yes diff --git a/.ansible/update.yaml b/.ansible/maintain.yaml similarity index 78% rename from .ansible/update.yaml rename to .ansible/maintain.yaml index b21d3a9..6342e1e 100644 --- a/.ansible/update.yaml +++ b/.ansible/maintain.yaml @@ -8,3 +8,7 @@ - import_role: name: ubuntu tasks_from: update + + - import_role: + name: docker + tasks_from: system_prune diff --git a/.ansible/roles/requirements.update.yaml b/.ansible/roles/requirements.update.yaml deleted file mode 100644 index 0017b8b..0000000 --- a/.ansible/roles/requirements.update.yaml +++ /dev/null @@ -1,4 +0,0 @@ -- name: ubuntu - scm: git - src: "git@github.com:Diesel-Net/ansible-role-ubuntu.git" - version: 2.2.0 diff --git a/.ansible/roles/requirements.deploy.yaml b/.ansible/roles/requirements.yaml similarity index 94% rename from .ansible/roles/requirements.deploy.yaml rename to .ansible/roles/requirements.yaml index 6b71ef0..5dd51b0 100644 --- a/.ansible/roles/requirements.deploy.yaml +++ b/.ansible/roles/requirements.yaml @@ -11,4 +11,4 @@ - name: docker scm: git src: "git@github.com:Diesel-Net/ansible-role-docker.git" - version: 1.3.0 + version: 1.4.0 diff --git a/.drone.yaml b/.drone.yaml index 73f9f78..754270d 100644 --- a/.drone.yaml +++ b/.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 ...