From c480cf222cf50e131f9160a39a7f954946b3353d Mon Sep 17 00:00:00 2001 From: Yujun Zhang Date: Fri, 21 Apr 2017 18:48:35 +0800 Subject: Fix bug on apex missing repository configuration and packages Change-Id: I929e3bafced56b2ab8fd90edc21421bd7bde2073 Signed-off-by: Yujun Zhang --- resources/roles/development-tools/tasks/main.yml | 23 --------------- resources/roles/nDPI/meta/main.yml | 12 -------- resources/roles/qtip-deps/tasks/debian.yml | 33 ++++++++++++++++++++++ resources/roles/qtip-deps/tasks/main.yml | 23 +++++++++++++++ resources/roles/qtip-deps/tasks/redhat.yml | 24 ++++++++++++++++ resources/roles/qtip-workspace/files/copy/run.yml | 2 +- .../roles/qtip-workspace/files/render/ansible.cfg | 2 +- resources/roles/ramspeed/meta/main.yml | 12 -------- resources/roles/unixbench/meta/main.yml | 12 -------- 9 files changed, 82 insertions(+), 61 deletions(-) delete mode 100644 resources/roles/development-tools/tasks/main.yml delete mode 100644 resources/roles/nDPI/meta/main.yml create mode 100644 resources/roles/qtip-deps/tasks/debian.yml create mode 100644 resources/roles/qtip-deps/tasks/main.yml create mode 100644 resources/roles/qtip-deps/tasks/redhat.yml delete mode 100644 resources/roles/ramspeed/meta/main.yml delete mode 100644 resources/roles/unixbench/meta/main.yml (limited to 'resources/roles') diff --git a/resources/roles/development-tools/tasks/main.yml b/resources/roles/development-tools/tasks/main.yml deleted file mode 100644 index 5fcb19db..00000000 --- a/resources/roles/development-tools/tasks/main.yml +++ /dev/null @@ -1,23 +0,0 @@ -############################################################################## -# Copyright (c) 2017 ZTE Corporation and others. -# -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## - -- name: install development tools for Debian family - package: - name: build-essential - state: present - when: ansible_os_family == "Debian" - -- name: install development tools for RedHat family - yum: - name: '{{ item }}' - state: present - when: ansible_os_family == "RedHat" - with_items: - - "@Development tools" - - gcc-c++ diff --git a/resources/roles/nDPI/meta/main.yml b/resources/roles/nDPI/meta/main.yml deleted file mode 100644 index 03c96c42..00000000 --- a/resources/roles/nDPI/meta/main.yml +++ /dev/null @@ -1,12 +0,0 @@ -############################################################################# -# Copyright (c) 2017 ZTE Corporation and others. -# -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################# - ---- -dependencies: - - { role: development-tools } diff --git a/resources/roles/qtip-deps/tasks/debian.yml b/resources/roles/qtip-deps/tasks/debian.yml new file mode 100644 index 00000000..1e15a68b --- /dev/null +++ b/resources/roles/qtip-deps/tasks/debian.yml @@ -0,0 +1,33 @@ +############################################################################## +# Copyright (c) 2017 ZTE Corporation and others. +# +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## + +--- +- name: Installing software properties common + apt: + name: "{{ item }}" + state: present + with_items: + - software-properties-common + +- name: Adding ubuntu backport main repo + apt_repository: + repo: "{{ item }}" + state: present + with_items: + - deb http://archive.ubuntu.com/ubuntu/ {{ansible_distribution_release}}-backports main restricted universe multiverse + - deb http://archive.ubuntu.com/ubuntu/ {{ansible_distribution_release}} main restricted universe multiverse + +- name: Installing required software + apt: + name: "{{ item }}" + state: present + with_items: + - build-essentials + - python-selinux + - libpcap-dev diff --git a/resources/roles/qtip-deps/tasks/main.yml b/resources/roles/qtip-deps/tasks/main.yml new file mode 100644 index 00000000..3e885796 --- /dev/null +++ b/resources/roles/qtip-deps/tasks/main.yml @@ -0,0 +1,23 @@ +############################################################################## +# Copyright (c) 2017 ZTE Corporation and others. +# +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## + +--- +- include: redhat.yml + when: ansible_os_family == "RedHat" + +- include: debian.yml + when: ansible_os_family == "Debian" + +- name: Installing required packages + package: + name: "{{ item }}" + state: present + with_items: + - rsync + - git diff --git a/resources/roles/qtip-deps/tasks/redhat.yml b/resources/roles/qtip-deps/tasks/redhat.yml new file mode 100644 index 00000000..6a53aacf --- /dev/null +++ b/resources/roles/qtip-deps/tasks/redhat.yml @@ -0,0 +1,24 @@ +############################################################################## +# Copyright (c) 2017 ZTE Corporation and others. +# +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## + +--- +- name: Installing epel release + yum: + name: epel-release + state: present + +- name: Installing required packages + yum: + name: "{{ item }}" + state: present + with_items: + - "@Development tools" + - gcc-c++ + - libselinux-python + - libpcap-devel diff --git a/resources/roles/qtip-workspace/files/copy/run.yml b/resources/roles/qtip-workspace/files/copy/run.yml index f84ea46c..d0f452aa 100644 --- a/resources/roles/qtip-workspace/files/copy/run.yml +++ b/resources/roles/qtip-workspace/files/copy/run.yml @@ -27,7 +27,7 @@ delegate_to: localhost roles: - - development-tools + - qtip-deps tags: [setup] diff --git a/resources/roles/qtip-workspace/files/render/ansible.cfg b/resources/roles/qtip-workspace/files/render/ansible.cfg index 8616fa97..1e4d04f4 100644 --- a/resources/roles/qtip-workspace/files/render/ansible.cfg +++ b/resources/roles/qtip-workspace/files/render/ansible.cfg @@ -239,7 +239,7 @@ filter_plugins = {{ qtip_package }}/qtip/ansible_library/plugins/filter # when looping. Instead of calling the module once per with_ item, the # module is called once with all items at once. Currently this only works # under limited circumstances, and only with parameters named 'name'. -#squash_actions = apk,apt,dnf,homebrew,pacman,pkgng,yum,zypper +squash_actions = apk,apt,dnf,homebrew,pacman,pkgng,yum,zypper # prevents logging of task data, off by default #no_log = False diff --git a/resources/roles/ramspeed/meta/main.yml b/resources/roles/ramspeed/meta/main.yml deleted file mode 100644 index 03c96c42..00000000 --- a/resources/roles/ramspeed/meta/main.yml +++ /dev/null @@ -1,12 +0,0 @@ -############################################################################# -# Copyright (c) 2017 ZTE Corporation and others. -# -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################# - ---- -dependencies: - - { role: development-tools } diff --git a/resources/roles/unixbench/meta/main.yml b/resources/roles/unixbench/meta/main.yml deleted file mode 100644 index 03c96c42..00000000 --- a/resources/roles/unixbench/meta/main.yml +++ /dev/null @@ -1,12 +0,0 @@ -############################################################################# -# Copyright (c) 2017 ZTE Corporation and others. -# -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################# - ---- -dependencies: - - { role: development-tools } -- cgit 1.2.3-korg