diff --git a/.ansible/deploy.yaml b/.ansible/deploy.yaml index 6b37d81..00d416f 100644 --- a/.ansible/deploy.yaml +++ b/.ansible/deploy.yaml @@ -13,8 +13,8 @@ name: ubuntu tasks_from: setup_user vars: - ansible_user: "{{ lookup('env', 'SUPER_USER') }}" - ansible_ssh_pass: "{{ lookup('env','SUPER_PASS') }}" + ansible_user: "{{ lookup('env', 'CLOUD_INIT_USER') }}" + ansible_ssh_pass: "{{ lookup('env','CLOUD_INIT_PASS') }}" ansible_sudo_pass: "{{ ansible_ssh_pass }}" diff --git a/.ansible/inventory/production/hosts b/.ansible/inventory/production/hosts index 4824862..df35b79 100644 --- a/.ansible/inventory/production/hosts +++ b/.ansible/inventory/production/hosts @@ -4,6 +4,7 @@ all: manager: hosts: prod.diesel.net: + automation-station.diesel.net: drone: hosts: diff --git a/.drone.yaml b/.drone.yaml index 559e5a8..f5febd0 100644 --- a/.drone.yaml +++ b/.drone.yaml @@ -12,10 +12,10 @@ steps: image: plugins/ansible:3 environment: ANSIBLE_CONFIG: .ansible/ansible.cfg - SUPER_USER: - from_secret: super_user - SUPER_PASS: - from_secret: super_pass + CLOUD_INIT_USER: + from_secret: cloud_init_user + CLOUD_INIT_PASS: + from_secret: cloud_init_pass settings: requirements: .ansible/files/requirements.txt galaxy: .ansible/roles/requirements.yaml @@ -44,8 +44,6 @@ kind: pipeline type: docker name: daily maintenance -clone: - depth: 1 steps: - name: update dev @@ -99,8 +97,6 @@ kind: pipeline type: docker name: weekly maintenance -clone: - depth: 1 steps: - name: clean dev diff --git a/README.md b/README.md index 5fc37ed..677e29e 100644 --- a/README.md +++ b/README.md @@ -25,17 +25,17 @@ pip3 install -r .ansible/files/requirements.txt You will need to have the ansible-vault password file configured on your machine. Please read the relevant [ansible documentation](https://docs.ansible.com/ansible/latest/user_guide/vault.html#setting-a-default-password-source) for more information. It is typically a good idea to test changes against the `development` inventory. -Bootstrap the `development` fleet. +`Bootstrap` the **development** fleet. ```bash ansible-playbook .ansible/deploy.yaml -i .ansible/inventory/development ``` -Clean the `development` fleet. +`Clean` the **development** fleet. ```bash ansible-playbook .ansible/clean.yaml -i .ansible/inventory/development ``` -Update the `development` fleet. +`Update` the **development** fleet. ```bash ansible-playbook .ansible/update.yaml -i .ansible/inventory/development ```