aboutsummaryrefslogtreecommitdiffstats
path: root/docker/ansible/roles
diff options
context:
space:
mode:
authorEmma Foley <efoley@redhat.com>2019-09-18 17:56:49 +0100
committerEmma Foley <efoley@redhat.com>2019-10-02 20:44:17 +0100
commit192c33b4504aaf8ae5563dab4bbd5117dbc03a47 (patch)
tree17db6ad90c03302304d019b3d089da0f66b809de /docker/ansible/roles
parent43934f597f3381a70ea231acdb172434e10794bb (diff)
Update ansible scripts to use py3 for Ubuntu and Fedora
Signed-off-by: Emma Foley <efoley@redhat.com> Change-Id: Ia62933a4b824f1280a693fc8004d29c67dc5e2ac
Diffstat (limited to 'docker/ansible/roles')
-rw-r--r--docker/ansible/roles/install_docker/tasks/fedora.yml47
-rw-r--r--docker/ansible/roles/install_docker/tasks/main.yml6
-rw-r--r--docker/ansible/roles/install_docker/tasks/ubuntu.yml11
3 files changed, 60 insertions, 4 deletions
diff --git a/docker/ansible/roles/install_docker/tasks/fedora.yml b/docker/ansible/roles/install_docker/tasks/fedora.yml
new file mode 100644
index 00000000..56eebd59
--- /dev/null
+++ b/docker/ansible/roles/install_docker/tasks/fedora.yml
@@ -0,0 +1,47 @@
+#Copyright 2019 Red Hat
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+---
+
+- name: Set Python interpreter
+ set_fact: ansible_python_interpreter=/usr/bin/python3
+
+- name: install dependencies for docker
+ package:
+ name: "{{ packages }}"
+ state: present
+ vars:
+ packages:
+ - python3-dnf
+ - python3
+ - libselinux-python
+
+- name: set up docker repository
+ command: "dnf config-manager --add-repo https://download.docker.com/linux/fedora/docker-ce.repo && dnf makecache"
+
+- name: install docker-py
+ package:
+ name: python3-docker
+ state: present
+
+- name: install docker
+ package:
+ name: docker-ce
+ state: present
+
+- name: start docker daemon
+ systemd:
+ name: docker
+ daemon_reload: true
+ state: started
+ enabled: true
diff --git a/docker/ansible/roles/install_docker/tasks/main.yml b/docker/ansible/roles/install_docker/tasks/main.yml
index 7e015bbc..ba356563 100644
--- a/docker/ansible/roles/install_docker/tasks/main.yml
+++ b/docker/ansible/roles/install_docker/tasks/main.yml
@@ -24,6 +24,12 @@
import_tasks: ubuntu.yml
when: ansible_distribution == "Ubuntu"
+- name: install docker for fedora
+ tags:
+ - install_docker
+ import_tasks: fedora.yml
+ when: ansible_distribution == "Fedora"
+
- name: install docker for centos
tags:
- install_docker
diff --git a/docker/ansible/roles/install_docker/tasks/ubuntu.yml b/docker/ansible/roles/install_docker/tasks/ubuntu.yml
index 44156873..f3aa81b1 100644
--- a/docker/ansible/roles/install_docker/tasks/ubuntu.yml
+++ b/docker/ansible/roles/install_docker/tasks/ubuntu.yml
@@ -13,20 +13,23 @@
# limitations under the License.
---
+- name: set Python interpreter
+ set_fact: ansible_python_interpreter=/usr/bin/python3
+
- name: update package manager cache
tags:
- cache_update
package:
update_cache: yes
-- name: install python
+- name: install python3
package:
- name: python
+ name: python3
state: present
-- name: install python-pip
+- name: install python3-pip
package:
- name: python-pip
+ name: python3-pip
state: present
- name: install docker-py