[EDGEPOD-226] Add installing strongswan to router role
Also fixed ansible-lint failures
Change-Id: I78fbab0a9e2f45ea4f5989c255f09b47ef01bdcc
diff --git a/aether-playbook/roles/k8s/tasks/docker.yml b/aether-playbook/roles/k8s/tasks/docker.yml
index 7d90bbb..619ab03 100644
--- a/aether-playbook/roles/k8s/tasks/docker.yml
+++ b/aether-playbook/roles/k8s/tasks/docker.yml
@@ -16,29 +16,26 @@
- name: Install dependencies for Docker
apt:
- name:
+ name: "{{ item }}"
+ state: present
+ with_items:
- apt-transport-https
- ca-certificates
- curl
- software-properties-common
- state: present
tags: docker
- name: Add Docker GPG key
- shell: |
- curl -sSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -
- args:
- warn: false
+ apt_key:
+ url: https://download.docker.com/linux/ubuntu/gpg
+ state: present
tags: docker
- name: Add Docker repository
- shell: |
- add-apt-repository \
- "deb [arch=amd64] https://download.docker.com/linux/ubuntu \
- $(lsb_release -cs) \
- stable"
- args:
- warn: false
+ apt_repository:
+ repo: deb [arch=amd64] https://download.docker.com/linux/ubuntu {{ ansible_distribution_release }} stable
+ update_cache: yes
+ state: present
tags: docker
- name: Install Docker CE
@@ -51,7 +48,8 @@
- name: Add current user to "docker" group
user:
name: "{{ ansible_user }}"
- groups: docker
+ groups:
+ - docker
append: true
tags: docker
diff --git a/aether-playbook/roles/k8s/tasks/k8s.yml b/aether-playbook/roles/k8s/tasks/k8s.yml
index 1561d1a..1fc73f6 100644
--- a/aether-playbook/roles/k8s/tasks/k8s.yml
+++ b/aether-playbook/roles/k8s/tasks/k8s.yml
@@ -35,6 +35,7 @@
msg: k8s_roles {{ k8s_roles }}
tags: k8s
+# TODO: Wait until K8S cluster is ready
- name: Install k8s
command: >-
docker run -d --privileged --restart=unless-stopped --net=host
@@ -45,4 +46,5 @@
--token {{ rancher_cluster_token }}
--ca-checksum {{ rancher_ca_checksum }}
{{ k8s_roles }}
+ changed_when: False
tags: k8s
diff --git a/aether-playbook/roles/k8s/tasks/pre-install.yml b/aether-playbook/roles/k8s/tasks/pre-install.yml
index b0b2bfa..6f475e4 100644
--- a/aether-playbook/roles/k8s/tasks/pre-install.yml
+++ b/aether-playbook/roles/k8s/tasks/pre-install.yml
@@ -18,18 +18,25 @@
update_cache: yes
- name: Install ntp
- apt: name=ntp state=present
+ apt:
+ name: ntp
+ state: present
when: ntp_enabled | bool
tags: ntp
- name: Configure ntp file
- template: src=etc/ntp.conf.j2 dest=/etc/ntp.conf
+ template:
+ src: etc/ntp.conf.j2
+ dest: /etc/ntp.conf
when: ntp_enabled | bool
notify: restart ntp
tags: ntp
- name: Start the ntp service
- service: name=ntp state=started enabled=yes
+ service:
+ name: ntp
+ state: started
+ enabled: yes
when: ntp_enabled | bool
tags: ntp