Skip to content

Commit

Permalink
Merge pull request #49 from Diesel-Net/development
Browse files Browse the repository at this point in the history
Add new host
  • Loading branch information
tomdaley92 authored Jan 20, 2022
2 parents dea7e8e + 61884e9 commit 2e96c40
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 13 deletions.
4 changes: 2 additions & 2 deletions .ansible/deploy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}"


Expand Down
1 change: 1 addition & 0 deletions .ansible/inventory/production/hosts
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ all:
manager:
hosts:
prod.diesel.net:
automation-station.diesel.net:

drone:
hosts:
Expand Down
12 changes: 4 additions & 8 deletions .drone.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -44,8 +44,6 @@ kind: pipeline
type: docker
name: daily maintenance

clone:
depth: 1

steps:
- name: update dev
Expand Down Expand Up @@ -99,8 +97,6 @@ kind: pipeline
type: docker
name: weekly maintenance

clone:
depth: 1

steps:
- name: clean dev
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
```

0 comments on commit 2e96c40

Please sign in to comment.