Skip to content

Commit

Permalink
Updated ansible scripts.
Browse files Browse the repository at this point in the history
Upgrade Ansible version, used aws_ec2 inventory plugin instead of ec2.py, and tweaked playbooks to remove warnings.
  • Loading branch information
cdanielw committed Jul 1, 2021
1 parent 5b83e35 commit daa2095
Show file tree
Hide file tree
Showing 43 changed files with 107 additions and 1,981 deletions.
1 change: 0 additions & 1 deletion ansible.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,3 @@ roles_path = ansible
[ssh_connection]
pipelining = True
control_path = /tmp/ansible-ssh-%%h-%%p-%%r

1 change: 1 addition & 0 deletions ansible/run-module/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
- name: "Run {{ module }}"
include_tasks: "../../../modules/{{ module }}/run.yml"
vars:
container_default_behavior: "compatibility"
api_version: "1.38"
name: "{{ container_name | default(module) }}"
pull: "{{ docker_repository_host != 'localhost' }}"
Expand Down
7 changes: 4 additions & 3 deletions deploy/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,17 +1,18 @@
FROM debian:buster
# Version 2021-04-30
FROM debian:bullseye
RUN apt-get update && apt-get install -y \
curl \
gettext \
git \
nano \
packer \
procps \
python3 \
python3-pip
RUN pip3 install \
ansible==2.9.15 \
ansible \
boto \
boto3
RUN ansible-galaxy collection install community.aws
RUN ansible-galaxy collection install amazon.aws
ADD boto.conf /root/.boto
ENV SEPAL_HOME=/usr/local/lib/sepal
4 changes: 3 additions & 1 deletion hosting-services/aws/ansible.cfg
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
[defaults]
interpreter_python=/usr/bin/python
force_valid_group_names = never
roles_path = ../../ansible
hash_behaviour = merge
Expand All @@ -7,4 +8,5 @@ hash_behaviour = merge
pipelining = True
control_path = /tmp/ansible-ssh-%%h-%%p-%%r


[inventory]
enable_plugins = aws_ec2, host_list, script, auto, yaml, ini, toml
219 changes: 0 additions & 219 deletions hosting-services/aws/inventory/ec2.ini

This file was deleted.

Loading

0 comments on commit daa2095

Please sign in to comment.