summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichal Ptacek <m.ptacek@partner.samsung.com>2019-05-21 07:07:25 +0000
committerGerrit Code Review <gerrit@onap.org>2019-05-21 07:07:25 +0000
commit929d4391d688128f24b44e1bba7b68843263b03f (patch)
tree7ce92e7afb2b65863c29a06591965cb1ecc21a53
parent0fd7a5a84706db4083f514dd1cefc205fa43b7c6 (diff)
parentb5f99a2fff91001f14eb870369dc0a584e9c81c0 (diff)
Merge changes from topic "RHEL"
* changes: Upgrade docker version to 18.09.5 Update of docker for RHEL
-rw-r--r--ansible/roles/docker/handlers/main.yml3
-rw-r--r--ansible/roles/docker/tasks/main.yml3
-rw-r--r--ansible/test/roles/prepare-docker/tasks/docker-packages.yml6
-rw-r--r--ansible/test/roles/prepare-docker/tasks/prepare-docker-repos.yml3
-rw-r--r--ansible/test/roles/prepare-docker/tasks/python2-docker.yml16
-rw-r--r--ansible/test/roles/prepare-docker/vars/main.yml5
-rwxr-xr-xbuild/creating_data/create-rhel-repo.sh12
-rw-r--r--docs/BuildGuide.rst4
8 files changed, 16 insertions, 36 deletions
diff --git a/ansible/roles/docker/handlers/main.yml b/ansible/roles/docker/handlers/main.yml
index de4a52ac..9916a81b 100644
--- a/ansible/roles/docker/handlers/main.yml
+++ b/ansible/roles/docker/handlers/main.yml
@@ -1,3 +1,6 @@
---
- name: Restart Docker
import_tasks: docker_restart.yml
+ when:
+ - ansible_env.container is defined
+ - ansible_env.container != 'docker'
diff --git a/ansible/roles/docker/tasks/main.yml b/ansible/roles/docker/tasks/main.yml
index 1925d09b..cd731b11 100644
--- a/ansible/roles/docker/tasks/main.yml
+++ b/ansible/roles/docker/tasks/main.yml
@@ -8,9 +8,10 @@
- name: Install docker python module
package:
- name: 'python2-docker'
+ name: 'python-docker-py'
state: present
+
- name: Install python jsonpointer module
package:
name: 'python-jsonpointer'
diff --git a/ansible/test/roles/prepare-docker/tasks/docker-packages.yml b/ansible/test/roles/prepare-docker/tasks/docker-packages.yml
index 1239e1a0..8f55c5ce 100644
--- a/ansible/test/roles/prepare-docker/tasks/docker-packages.yml
+++ b/ansible/test/roles/prepare-docker/tasks/docker-packages.yml
@@ -1,10 +1,10 @@
---
- name: Download docker related packages
- command: yumdownloader --destdir="{{ rpm_dir }}" "{{ docker_ce_rpm }}" "{{ docker_ce_selinux_rpm }}"
+ command: yumdownloader --destdir="{{ rpm_dir }}" "{{ docker_ce_rpm }}"
args:
- creates: "{{ rpm_dir }}/{{ docker_ce_selinux_rpm }}"
+ creates: "{{ rpm_dir }}/{{ docker_ce_rpm }}"
- name: Install docker related packages
yum:
- name: "{{ rpm_dir + '/' + docker_ce_rpm + '.rpm'}},{{ rpm_dir + '/' + docker_ce_selinux_rpm + '.rpm' }}"
+ name: "{{ rpm_dir + '/' + docker_ce_rpm + '.rpm'}}"
diff --git a/ansible/test/roles/prepare-docker/tasks/prepare-docker-repos.yml b/ansible/test/roles/prepare-docker/tasks/prepare-docker-repos.yml
index f35ffeee..01ea72c3 100644
--- a/ansible/test/roles/prepare-docker/tasks/prepare-docker-repos.yml
+++ b/ansible/test/roles/prepare-docker/tasks/prepare-docker-repos.yml
@@ -12,9 +12,6 @@
path: "{{ rpm_dir }}"
state: directory
-- name: Handle python2-docker dependency needed by Ansible's docker_* modules
- import_tasks: python2-docker.yml
-
- name: Handle docker-ce packages
import_tasks: docker-packages.yml
diff --git a/ansible/test/roles/prepare-docker/tasks/python2-docker.yml b/ansible/test/roles/prepare-docker/tasks/python2-docker.yml
deleted file mode 100644
index f091cf85..00000000
--- a/ansible/test/roles/prepare-docker/tasks/python2-docker.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-- name: Remove docker-python that is conflicting with python2-docker
- package:
- name: docker-python
- state: absent
-
-- name: Download python2-docker rpm for Ansible (docker_container module dep)
- get_url:
- url: "{{ python2_docker_rpm_url }}"
- dest: "{{ rpm_dir }}"
- register: rpm
-
-- name: Install docker python module
- package:
- name: "{{ rpm_dir + '/' + python2_docker_rpm }}"
- state: present
diff --git a/ansible/test/roles/prepare-docker/vars/main.yml b/ansible/test/roles/prepare-docker/vars/main.yml
index aabd65dc..bcd7f365 100644
--- a/ansible/test/roles/prepare-docker/vars/main.yml
+++ b/ansible/test/roles/prepare-docker/vars/main.yml
@@ -4,7 +4,4 @@ docker_needed_repos:
- /etc/yum.repos.d/docker-ce.repo.disabled
offline_repo_file: /etc/yum.repos.d/onap.repo
rpm_dir: /root/rpm
-python2_docker_rpm: python2-docker-2.5.1-2.el7.noarch.rpm
-python2_docker_rpm_url: "https://cbs.centos.org/kojifiles/packages/python-docker/2.5.1/2.el7/noarch/{{ python2_docker_rpm }}"
-docker_ce_rpm: docker-ce-17.03.2.ce-1.el7.centos.x86_64
-docker_ce_selinux_rpm: docker-ce-selinux-17.03.3.ce-1.el7.noarch
+docker_ce_rpm: docker-ce-18.09.5-3.el7.x86_64
diff --git a/build/creating_data/create-rhel-repo.sh b/build/creating_data/create-rhel-repo.sh
index ca5a5352..43709a7e 100755
--- a/build/creating_data/create-rhel-repo.sh
+++ b/build/creating_data/create-rhel-repo.sh
@@ -1,6 +1,6 @@
# COPYRIGHT NOTICE STARTS HERE
#
-# Copyright 2018 © Samsung Electronics Co., Ltd.
+# Copyright 2018-2019 © Samsung Electronics Co., Ltd.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -36,12 +36,10 @@ fi
# this exact docker version is required by ONAP/beijing
# it should be available in centos docker repo
-yumdownloader --resolve --destdir="${OUTDIR}" docker-ce-17.03.2.ce libtool-ltdl docker-ce-selinux nfs-utils python-jsonpointer
-
-wget https://cbs.centos.org/kojifiles/packages/python-docker/2.5.1/2.el7/noarch/python2-docker-2.5.1-2.el7.noarch.rpm -P "${OUTDIR}"
-
-yum install --downloadonly --downloaddir="${OUTDIR}" "${OUTDIR}/python2-docker-2.5.1-2.el7.noarch.rpm"
+yumdownloader --resolve --destdir="${OUTDIR}" docker-ce-18.09.5 container-selinux docker-ce-cli \
+containerd.io nfs-utils python-jsonpointer python-docker-py python-docker-pycreds python-ipaddress \
+python-websocket-client
createrepo "${OUTDIR}"
-exit 0
+exit 0 \ No newline at end of file
diff --git a/docs/BuildGuide.rst b/docs/BuildGuide.rst
index c79c0b04..8ae08d8d 100644
--- a/docs/BuildGuide.rst
+++ b/docs/BuildGuide.rst
@@ -29,7 +29,7 @@ More-over following sw packages has to be installed:
* for the Download artifacts for offline installer (Part 2) and the Populate local nexus (Part 3)
- nodejs
- jq
- - docker (exact version docker-ce-17.03.2)
+ - docker (exact version docker-ce-18.09.5)
* for the Download artifacts for offline installer (Part 2) and for the Application helm charts preparation and patching (Part 4)
- patch
@@ -75,7 +75,7 @@ Subsequent steps are the same on both platforms:
pip install twine
# install docker
- curl https://releases.rancher.com/install-docker/17.03.sh | sh
+ curl https://releases.rancher.com/install-docker/18.09.sh | sh
Then it is necessary to clone all installer and build related repositories and prepare the directory structure.