From ae5ecc29844211cc3e9f794cbf975a42657a8ff1 Mon Sep 17 00:00:00 2001 From: Stepan Andrushko Date: Mon, 22 Oct 2018 14:18:16 +0300 Subject: Create docker image for Ubuntu 18.04 Added possibility to build docker image from Ubuntu 18.04, resolved package dependencies applied for both Ubuntu 16.04 and Ubuntu 18.04. Removed conflicting Ubuntu '-proposed' repo from dependencies as it should be used for testing purposes only. JIRA: YARDSTICK-1470 Change-Id: Ia1ed5c5ab6799bd328cc517e753e3b867ce4915a Signed-off-by: Stepan Andrushko --- ansible/roles/add_repos_jumphost/tasks/Debian.yml | 1 - ansible/roles/install_dependencies_jumphost/tasks/Debian.yml | 2 -- 2 files changed, 3 deletions(-) (limited to 'ansible') diff --git a/ansible/roles/add_repos_jumphost/tasks/Debian.yml b/ansible/roles/add_repos_jumphost/tasks/Debian.yml index 626f0b037..e15699617 100644 --- a/ansible/roles/add_repos_jumphost/tasks/Debian.yml +++ b/ansible/roles/add_repos_jumphost/tasks/Debian.yml @@ -71,7 +71,6 @@ deb [arch={{ extra_arch }}] {{ extra_repo }} {{ ansible_distribution_release }} main universe multiverse restricted deb [arch={{ extra_arch }}] {{ extra_repo }} {{ ansible_distribution_release }}-updates main universe multiverse restricted deb [arch={{ extra_arch }}] {{ extra_repo }} {{ ansible_distribution_release }}-security main universe multiverse restricted - deb [arch={{ extra_arch }}] {{ extra_repo }} {{ ansible_distribution_release }}-proposed main universe multiverse restricted when: installation_mode == "container" - name: Remove the marker diff --git a/ansible/roles/install_dependencies_jumphost/tasks/Debian.yml b/ansible/roles/install_dependencies_jumphost/tasks/Debian.yml index f1fb43827..419f81bfd 100755 --- a/ansible/roles/install_dependencies_jumphost/tasks/Debian.yml +++ b/ansible/roles/install_dependencies_jumphost/tasks/Debian.yml @@ -29,7 +29,6 @@ - vim - libffi-dev - libfuse-dev - - libssl-dev - libxft-dev - libxml2-dev - libxss-dev @@ -52,7 +51,6 @@ - uwsgi-plugin-python - supervisor - lsof - - nodejs - npm - rabbitmq-server -- cgit 1.2.3-korg