diff --git a/roles/xmpp_server/molecule/default/host_vars/ldap-server.yml b/roles/xmpp_server/molecule/default/host_vars/ldap-server.yml index 9ccaa3b9af567aa47030f9fc4b364d3f387bfe11..8cf2a3d9ee73ed5abe9e1c6c8b1b05391616d14a 100644 --- a/roles/xmpp_server/molecule/default/host_vars/ldap-server.yml +++ b/roles/xmpp_server/molecule/default/host_vars/ldap-server.yml @@ -39,9 +39,6 @@ backup_host_ssh_private_keys: ed25519: "{{ lookup('file', 'tests/data/ssh/server_ed25519') }}" ecdsa: "{{ lookup('file', 'tests/data/ssh/server_ecdsa') }}" backup_clients: - - server: parameters-optional-stretch - ip: 10.31.127.33 - public_key: "{{ lookup('file', 'tests/data/ssh/parameters-optional.pub') }}" - server: parameters-optional-buster ip: 10.31.127.31 public_key: "{{ lookup('file', 'tests/data/ssh/parameters-optional.pub') }}" diff --git a/roles/xmpp_server/molecule/default/molecule.yml b/roles/xmpp_server/molecule/default/molecule.yml index 166e683420d8f7b7f08a4ca521ca2c2d10ccf5d3..a92a818d2eb2769293e174814c5a77dd2ebbbf0f 100644 --- a/roles/xmpp_server/molecule/default/molecule.yml +++ b/roles/xmpp_server/molecule/default/molecule.yml @@ -15,51 +15,12 @@ lint: platforms: - name: ldap-server - box: debian/contrib-stretch64 - memory: 512 - cpus: 1 - interfaces: - - auto_config: true - ip: 10.31.127.10 - network_name: private_network - type: static - - - name: client-stretch - groups: - - clients - - stretch - box: debian/contrib-stretch64 - memory: 256 - cpus: 1 - interfaces: - - auto_config: true - ip: 10.31.127.21 - network_name: private_network - type: static - - - name: parameters-mandatory-stretch64 - groups: - - parameters-mandatory - - stretch - box: debian/contrib-stretch64 - memory: 512 - cpus: 1 - interfaces: - - auto_config: true - ip: 10.31.127.32 - network_name: private_network - type: static - - - name: parameters-optional-stretch64 - groups: - - parameters-optional - - stretch - box: debian/contrib-stretch64 + box: debian/contrib-buster64 memory: 512 cpus: 1 interfaces: - auto_config: true - ip: 10.31.127.33 + ip: 192.168.56.10 network_name: private_network type: static @@ -72,7 +33,7 @@ platforms: cpus: 1 interfaces: - auto_config: true - ip: 10.31.127.20 + ip: 192.168.56.20 network_name: private_network type: static @@ -85,7 +46,7 @@ platforms: cpus: 1 interfaces: - auto_config: true - ip: 10.31.127.30 + ip: 192.168.56.30 network_name: private_network type: static @@ -98,7 +59,7 @@ platforms: cpus: 1 interfaces: - auto_config: true - ip: 10.31.127.31 + ip: 192.168.56.31 network_name: private_network type: static diff --git a/roles/xmpp_server/molecule/default/prepare.yml b/roles/xmpp_server/molecule/default/prepare.yml index f9487affda50e6c40543cf2df1befaf085015f9b..eec594f4de53d5f57a60e44a9b1e6a24acb72610 100644 --- a/roles/xmpp_server/molecule/default/prepare.yml +++ b/roles/xmpp_server/molecule/default/prepare.yml @@ -22,21 +22,6 @@ - name: ldap-server_ldap fqdn: - ldap-server - - name: parameters-mandatory-stretch64_xmpp - fqdn: - - parameters-mandatory - - domain1 - - proxy.domain1 - - conference.domain1 - - name: parameters-optional-stretch64_xmpp - fqdn: - - parameters-optional - - domain2 - - proxy.domain2 - - conference.domain2 - - domain3 - - proxy.domain3 - - conference.domain3 - name: parameters-mandatory-buster64_xmpp fqdn: - parameters-mandatory @@ -90,25 +75,6 @@ regexp: "host\\.name\\)" replace: "host.targetname)" -- hosts: stretch - become: true - tasks: - - - name: Set-up the hosts file - lineinfile: - path: /etc/hosts - regexp: "^{{ item.key }}" - line: "{{ item.key }} {{ item.value }}" - owner: root - group: root - mode: 0644 - state: present - with_dict: - 10.31.127.10: "ldap-server backup-server" - 10.31.127.21: "client-stretch" - 10.31.127.32: "parameters-mandatory domain1 proxy.domain1 conference.domain1" - 10.31.127.33: "parameters-optional domain2 proxy.domain2 conference.domain2 domain3 proxy.domain3 conference.domain3" - - hosts: buster become: true tasks: @@ -123,10 +89,10 @@ mode: 0644 state: present with_dict: - 10.31.127.10: "ldap-server backup-server" - 10.31.127.20: "client-stretch" - 10.31.127.30: "parameters-mandatory domain1 proxy.domain1 conference.domain1" - 10.31.127.31: "parameters-optional domain2 proxy.domain2 conference.domain2 domain3 proxy.domain3 conference.domain3" + 192.168.56.10: "ldap-server backup-server" + 192.168.56.20: "client-buster" + 192.168.56.30: "parameters-mandatory domain1 proxy.domain1 conference.domain1" + 192.168.56.31: "parameters-optional domain2 proxy.domain2 conference.domain2 domain3 proxy.domain3 conference.domain3" - name: Enable TLSv1.0+ in global OpenSSL configuration file in order to be able to test the xmpp_server_tls_protocol parameter lineinfile: @@ -138,14 +104,6 @@ mode: 0644 state: present - - name: Deploy lua-ldap package pin for testing Stretch -> Buster upgrade scenario (no need to pin the package in Buster) - copy: - src: "lua_ldap_backports_pin" - dest: "/etc/apt/preferences.d/lua-ldap" - owner: root - group: root - mode: 0644 - - hosts: clients become: true tasks: diff --git a/roles/xmpp_server/molecule/default/tests/test_default_stretch.py b/roles/xmpp_server/molecule/default/tests/test_default_stretch.py deleted file mode 100644 index c293aaf3f8a36ad8f678dad71304e13c0affa48f..0000000000000000000000000000000000000000 --- a/roles/xmpp_server/molecule/default/tests/test_default_stretch.py +++ /dev/null @@ -1,45 +0,0 @@ -import os - -import testinfra.utils.ansible_runner - - -testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner( - os.environ['MOLECULE_INVENTORY_FILE']).get_hosts('parameters-*-stretch64') - - -def test_backports_repository(host): - """ - Tests if backports repository has been added. - """ - - repository = host.file("/etc/apt/sources.list.d/backports.list") - - distribution_release = host.ansible("setup")["ansible_facts"]["ansible_distribution_release"] - - expected_content = "deb http://ftp.debian.org/debian %s-backports main\n" % distribution_release - - assert repository.is_file - assert repository.user == 'root' - assert repository.group == 'root' - assert repository.mode == 0o644 - assert repository.content_string == expected_content - - -def test_lua_ldap_pin_and_version(host): - """ - Tests if lua-ldap package has been correctly pinned to the - backports repository. - """ - - distribution_major_version = host.ansible("setup")["ansible_facts"]["ansible_distribution_major_version"] - backports_version_suffix = "bpo%s" % distribution_major_version - - pin_configuration_file = host.file("/etc/apt/preferences.d/lua-ldap") - lua_ldap = host.package("lua-ldap") - - assert pin_configuration_file.is_file - assert pin_configuration_file.user == 'root' - assert pin_configuration_file.group == 'root' - assert pin_configuration_file.mode == 0o644 - - assert backports_version_suffix in lua_ldap.version diff --git a/roles/xmpp_server/tasks/main.yml b/roles/xmpp_server/tasks/main.yml index 53fd01212cbcf089a17e4c0d3321fae63bc8b796..220d679cb94ce2f14e691b433ae7baa8ec7ad7e6 100644 --- a/roles/xmpp_server/tasks/main.yml +++ b/roles/xmpp_server/tasks/main.yml @@ -4,29 +4,6 @@ apt: name: python-apt -- name: Add Debian backports repository for Debian Stretch - apt_repository: - repo: "deb http://ftp.debian.org/debian {{ ansible_distribution_release }}-backports main" - filename: "backports" - state: present - mode: 0644 - when: "ansible_distribution_release == 'stretch'" - -- name: Pin the lua-ldap package to backports repository for Debian Stretch - template: - src: "lua_ldap_backports_pin.j2" - dest: "/etc/apt/preferences.d/lua-ldap" - owner: root - group: root - mode: 0644 - when: "ansible_distribution_release == 'stretch'" - -- name: Drop the Pin lua-ldap package (if machine was upgraded from Debian Stretch) - file: - path: "/etc/apt/preferences.d/lua-ldap" - state: absent - when: "ansible_distribution_release != 'stretch'" - - name: Add Prosody repository apt key apt_key: data: "{{ lookup('file', 'prosody-debian-gpg-key.asc') }}"