summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--resources/roles/qtip-deps/tasks/debian.yml33
-rw-r--r--resources/roles/qtip-deps/tasks/main.yml (renamed from resources/roles/development-tools/tasks/main.yml)20
-rw-r--r--resources/roles/qtip-deps/tasks/redhat.yml (renamed from resources/roles/nDPI/meta/main.yml)20
-rw-r--r--resources/roles/qtip-workspace/files/copy/run.yml2
-rw-r--r--resources/roles/qtip-workspace/files/render/ansible.cfg2
-rw-r--r--resources/roles/ramspeed/meta/main.yml12
-rw-r--r--resources/roles/unixbench/meta/main.yml12
-rw-r--r--tests/integration/workspace-create.yml4
8 files changed, 63 insertions, 42 deletions
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/development-tools/tasks/main.yml b/resources/roles/qtip-deps/tasks/main.yml
index 5fcb19db..3e885796 100644
--- a/resources/roles/development-tools/tasks/main.yml
+++ b/resources/roles/qtip-deps/tasks/main.yml
@@ -7,17 +7,17 @@
# http://www.apache.org/licenses/LICENSE-2.0
##############################################################################
-- name: install development tools for Debian family
- package:
- name: build-essential
- state: present
+---
+- include: redhat.yml
+ when: ansible_os_family == "RedHat"
+
+- include: debian.yml
when: ansible_os_family == "Debian"
-- name: install development tools for RedHat family
- yum:
- name: '{{ item }}'
+- name: Installing required packages
+ package:
+ name: "{{ item }}"
state: present
- when: ansible_os_family == "RedHat"
with_items:
- - "@Development tools"
- - gcc-c++
+ - rsync
+ - git
diff --git a/resources/roles/nDPI/meta/main.yml b/resources/roles/qtip-deps/tasks/redhat.yml
index 03c96c42..6a53aacf 100644
--- a/resources/roles/nDPI/meta/main.yml
+++ b/resources/roles/qtip-deps/tasks/redhat.yml
@@ -1,12 +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
-#############################################################################
+##############################################################################
---
-dependencies:
- - { role: development-tools }
+- 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 }
diff --git a/tests/integration/workspace-create.yml b/tests/integration/workspace-create.yml
index 1b473260..ad4ff7ff 100644
--- a/tests/integration/workspace-create.yml
+++ b/tests/integration/workspace-create.yml
@@ -20,8 +20,8 @@
# opnfv environment
- installer: fuel # <fuel|apex>
- installer_master_host: f5 # make sure you can login it with key authentication
+ installer: apex # <fuel|apex>
+ installer_master_host: apex-virtual # make sure you can login it with key authentication
# set testapi_url to enable reportint to testapi