From 2b6bc63bcc5bec1ec3bad819ec52aa32a7503122 Mon Sep 17 00:00:00 2001 From: Ricardo Dias Date: Fri, 1 Jul 2016 10:31:03 +0100 Subject: [PATCH] roles: testnode: Support for openSUSE Leap Signed-off-by: Ricardo Dias --- roles/testnode/tasks/ssh.yml | 2 +- roles/testnode/tasks/vars.yml | 6 +- roles/testnode/tasks/zypper/packages.yml | 37 +++++++++ roles/testnode/tasks/zypper_systems.yml | 13 +--- ...e leap_42 => sshd_config_opensuse_leap_42} | 2 + roles/testnode/vars/opensuse_leap_42.1.yml | 76 +++++++++++++++++++ 6 files changed, 123 insertions(+), 13 deletions(-) create mode 100644 roles/testnode/tasks/zypper/packages.yml rename roles/testnode/templates/ssh/{sshd_config_opensuse leap_42 => sshd_config_opensuse_leap_42} (94%) create mode 100644 roles/testnode/vars/opensuse_leap_42.1.yml diff --git a/roles/testnode/tasks/ssh.yml b/roles/testnode/tasks/ssh.yml index 06c8ed21..81b7d2dd 100644 --- a/roles/testnode/tasks/ssh.yml +++ b/roles/testnode/tasks/ssh.yml @@ -1,7 +1,7 @@ --- - name: Upload distro major version specific sshd_config template: - src: "ssh/sshd_config_{{ ansible_distribution | lower }}_{{ ansible_distribution_major_version }}" + src: "ssh/sshd_config_{{ ansible_distribution | lower | regex_replace(' ', '_') }}_{{ ansible_distribution_major_version }}" dest: /etc/ssh/sshd_config owner: root group: root diff --git a/roles/testnode/tasks/vars.yml b/roles/testnode/tasks/vars.yml index 2c955d14..857b2324 100644 --- a/roles/testnode/tasks/vars.yml +++ b/roles/testnode/tasks/vars.yml @@ -5,17 +5,17 @@ - name: Including distro specific variables. include_vars: "{{ item }}" with_first_found: - - "{{ ansible_distribution | lower }}.yml" + - "{{ ansible_distribution | lower | regex_replace(' ', '_') }}.yml" - empty.yml - name: Including major version specific variables. include_vars: "{{ item }}" with_first_found: - - "{{ ansible_distribution | lower }}_{{ ansible_distribution_major_version }}.yml" + - "{{ ansible_distribution | lower | regex_replace(' ', '_') }}_{{ ansible_distribution_major_version }}.yml" - empty.yml - name: Including version specific variables. include_vars: "{{ item }}" with_first_found: - - "{{ ansible_distribution | lower }}_{{ ansible_distribution_version }}.yml" + - "{{ ansible_distribution | lower | regex_replace(' ', '_') }}_{{ ansible_distribution_version }}.yml" - empty.yml diff --git a/roles/testnode/tasks/zypper/packages.yml b/roles/testnode/tasks/zypper/packages.yml new file mode 100644 index 00000000..81c2479f --- /dev/null +++ b/roles/testnode/tasks/zypper/packages.yml @@ -0,0 +1,37 @@ +--- +- name: Ensure ceph packages are not present. + zypper: + name: "{{ item }}" + state: absent + with_items: ceph_packages_to_remove + tags: + - remove-ceph + +- name: Ensure ceph dependency packages are not present. + zypper: + name: "{{ item }}" + state: absent + with_items: ceph_dependency_packages_to_remove + tags: + - remove-ceph-dependency + +- name: Remove packages + zypper: + name: "{{ item }}" + state: absent + with_items: packages_to_remove + when: packages_to_remove|length > 0 + +- name: Install packages + zypper: + name: "{{ item }}" + state: present + with_items: packages + when: packages|length > 0 + +- name: Upgrade packages + zypper: + name: "{{ item }}" + state: latest + with_items: packages_to_upgrade + when: packages_to_upgrade|length > 0 diff --git a/roles/testnode/tasks/zypper_systems.yml b/roles/testnode/tasks/zypper_systems.yml index 82015b4e..6efed232 100644 --- a/roles/testnode/tasks/zypper_systems.yml +++ b/roles/testnode/tasks/zypper_systems.yml @@ -46,13 +46,8 @@ command: rpm --rebuilddb -#- name: Setup local repo files. -# include: yum/repos.yml -# tags: -# - repos - -#- name: Perform package related tasks. -# include: yum/packages.yml -# tags: -# - packages +- name: Perform package related tasks. + include: zypper/packages.yml + tags: + - packages diff --git a/roles/testnode/templates/ssh/sshd_config_opensuse leap_42 b/roles/testnode/templates/ssh/sshd_config_opensuse_leap_42 similarity index 94% rename from roles/testnode/templates/ssh/sshd_config_opensuse leap_42 rename to roles/testnode/templates/ssh/sshd_config_opensuse_leap_42 index 7b73050c..f0c34664 100644 --- a/roles/testnode/templates/ssh/sshd_config_opensuse leap_42 +++ b/roles/testnode/templates/ssh/sshd_config_opensuse_leap_42 @@ -5,3 +5,5 @@ Subsystem sftp /usr/lib/ssh/sftp-server AcceptEnv LANG LC_CTYPE LC_NUMERIC LC_TIME LC_COLLATE LC_MONETARY LC_MESSAGES AcceptEnv LC_PAPER LC_NAME LC_ADDRESS LC_TELEPHONE LC_MEASUREMENT AcceptEnv LC_IDENTIFICATION LC_ALL + +MaxSessions 1000 diff --git a/roles/testnode/vars/opensuse_leap_42.1.yml b/roles/testnode/vars/opensuse_leap_42.1.yml new file mode 100644 index 00000000..3bd317f2 --- /dev/null +++ b/roles/testnode/vars/opensuse_leap_42.1.yml @@ -0,0 +1,76 @@ +--- +# vars specific to OpenSuse Leap 42.1 +packages_to_remove: + - gettext-runtime-mini + +packages: + - lsb-release + - sysstat + - gdb + - make + - git + - python-configobj + # for running ceph + - libedit0 + - libboost_thread1_54_0 + - xfsprogs + - gptfdisk + - parted + - libgcrypt20 + - fuse + - fuse-devel + - libfuse2 + ### + # for ceph-deploy + - python-virtualenv + ### + - openssl + - libuuid1 + - btrfsprogs + # used by workunits + - attr + - valgrind + - python-nose + - ant + - iozone + ### + # used by the xfstests tasks + - libtool + - automake + - gettext-runtime + - libuuid-devel + - libacl-devel + - bc + - xfsdump + - xfsprogs-devel + ### + # for blktrace and seekwatcher + - blktrace + - python-numpy + - python-matplotlib + ### + # for qemu + - qemu-kvm + - usbredir + - genisoimage + ### + # for apache and rgw + - apache2 + - apache2-devel + - apache2-utils + - apache2-mod_fastcgi + ### + - libevent-devel + # for pretty-printing xml + - perl-XML-Twig + # for java bindings, hadoop, etc. + - java-1_8_0-openjdk-devel + - junit + # for disk/etc monitoring + - smartmontools + # for nfs + - nfs-kernel-server + # for xfstests + - ncurses-devel + + -- 2.47.3