diff --git a/tests/ansible-role-requirements.yml b/tests/ansible-role-requirements.yml deleted file mode 100644 index a2c4d3b..0000000 --- a/tests/ansible-role-requirements.yml +++ /dev/null @@ -1,81 +0,0 @@ ---- -- name: apt_package_pinning - src: https://opendev.org/openstack/openstack-ansible-apt_package_pinning - scm: git - version: master -- name: memcached_server - src: https://opendev.org/openstack/openstack-ansible-memcached_server - scm: git - version: master -- name: lxc_hosts - src: https://opendev.org/openstack/openstack-ansible-lxc_hosts - scm: git - version: master -- name: lxc_container_create - src: https://opendev.org/openstack/openstack-ansible-lxc_container_create - scm: git - version: master -- name: galera_client - src: https://opendev.org/openstack/openstack-ansible-galera_client - scm: git - version: master -- name: galera_server - src: https://opendev.org/openstack/openstack-ansible-galera_server - scm: git - version: master -- name: rabbitmq_server - src: https://opendev.org/openstack/openstack-ansible-rabbitmq_server - scm: git - version: master -- name: openstack_openrc - src: https://opendev.org/openstack/openstack-ansible-openstack_openrc - scm: git - version: master -- name: os_keystone - src: https://opendev.org/openstack/openstack-ansible-os_keystone - scm: git - version: master -- name: os_glance - src: https://opendev.org/openstack/openstack-ansible-os_glance - scm: git - version: master -- name: etcd # dependency of os_neutron role - scm: git - src: https://github.com/logan2211/ansible-etcd - version: master -- name: os_nova - src: https://opendev.org/openstack/openstack-ansible-os_nova - scm: git - version: master -- name: os_neutron - src: https://opendev.org/openstack/openstack-ansible-os_neutron - scm: git - version: master -- name: os_cinder - src: https://opendev.org/openstack/openstack-ansible-os_cinder - scm: git - version: master -- name: os_tempest - src: https://opendev.org/openstack/openstack-ansible-os_tempest - scm: git - version: master -- name: openstack_hosts - src: https://opendev.org/openstack/openstack-ansible-openstack_hosts - scm: git - version: master -- name: ceph_client - src: https://opendev.org/openstack/openstack-ansible-ceph_client - scm: git - version: master -- name: systemd_service - src: https://opendev.org/openstack/ansible-role-systemd_service - scm: git - version: master -- name: python_venv_build - src: https://opendev.org/openstack/ansible-role-python_venv_build - scm: git - version: master -- name: uwsgi - src: https://opendev.org/openstack/ansible-role-uwsgi - scm: git - version: master diff --git a/tests/cinder-initiator.yml b/tests/cinder-initiator.yml deleted file mode 100644 index ee5d533..0000000 --- a/tests/cinder-initiator.yml +++ /dev/null @@ -1,18 +0,0 @@ ---- -- name: Set iSCSI InitiatorName - hosts: storage1 - remote_user: root - gather_facts: false - any_errors_fatal: true - tasks: - - name: Get iSCSI InitiatorName - command: /usr/sbin/iscsi-iname - register: initiator_name - tags: - - skip_ansible_lint - - - name: Write iSCSI InitiatorName - lineinfile: - path: /etc/iscsi/initiatorname.iscsi - regexp: '^InitiatorName=' - line: "InitiatorName={{ initiator_name.stdout }}" diff --git a/tests/group_vars/all_containers.yml b/tests/group_vars/all_containers.yml deleted file mode 100644 index c81b9c2..0000000 --- a/tests/group_vars/all_containers.yml +++ /dev/null @@ -1,36 +0,0 @@ ---- -# Copyright 2019, Rackspace US, Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -container_networks: - management_address: - address: "{{ ansible_host }}" - bridge: "br-mgmt" - interface: "eth1" - netmask: "255.255.255.0" - type: "veth" - tunnel_address: - address: "{{ tunnel_address }}" - bridge: "br-vxlan" - interface: "eth2" - netmask: "255.255.255.0" - type: "veth" - vlan_address: - bridge: "br-vlan" - interface: "eth12" - netmask: null - type: "veth" -physical_host: localhost -properties: - service_name: "{{ inventory_hostname }}" diff --git a/tests/host_vars/infra1.yml b/tests/host_vars/infra1.yml deleted file mode 100644 index a6f0165..0000000 --- a/tests/host_vars/infra1.yml +++ /dev/null @@ -1,20 +0,0 @@ ---- -# Copyright 2019, Rackspace US, Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -ansible_host: 10.1.1.101 -ansible_become: True -ansible_user: root -container_name: infra1 -tunnel_address: 10.1.2.101 diff --git a/tests/host_vars/localhost.yml b/tests/host_vars/localhost.yml deleted file mode 100644 index 301c483..0000000 --- a/tests/host_vars/localhost.yml +++ /dev/null @@ -1,23 +0,0 @@ ---- -# Copyright 2019, Rackspace US, Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -bridges: - - name: "br-mgmt" - ip_addr: "10.1.1.1" - - name: "br-vxlan" - ip_addr: "10.1.2.1" - - name: "br-vlan" - ip_addr: "10.1.3.1" - veth_peer: "eth12" diff --git a/tests/host_vars/manila1.yml b/tests/host_vars/manila1.yml deleted file mode 100644 index 99ecb74..0000000 --- a/tests/host_vars/manila1.yml +++ /dev/null @@ -1,20 +0,0 @@ ---- -# Copyright 2019, Rackspace US, Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -ansible_host: 10.1.1.103 -ansible_become: True -ansible_user: root -container_name: manila1 -tunnel_address: 10.1.2.103 diff --git a/tests/host_vars/openstack1.yml b/tests/host_vars/openstack1.yml deleted file mode 100644 index a3f3f4b..0000000 --- a/tests/host_vars/openstack1.yml +++ /dev/null @@ -1,25 +0,0 @@ ---- -# Copyright 2019, Rackspace US, Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -neutron_provider_networks: - network_types: "vxlan,flat" - network_mappings: "flat:eth12" - network_vxlan_ranges: "1:1000" -ansible_host: 10.1.1.102 -ansible_become: True -ansible_user: root -container_name: openstack1 -tunnel_address: 10.1.2.102 -neutron_local_ip: 10.1.2.102 diff --git a/tests/host_vars/storage1.yml b/tests/host_vars/storage1.yml deleted file mode 100644 index ebeab39..0000000 --- a/tests/host_vars/storage1.yml +++ /dev/null @@ -1,28 +0,0 @@ ---- -# Copyright 2019, Rackspace US, Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -ansible_host: "10.1.1.1" -neutron_local_ip: 10.1.2.1 -neutron_provider_networks: - network_types: "vxlan,flat" - network_mappings: "flat:eth12" - network_vxlan_ranges: "1:1000" - -cinder_backends: - lvm: - volume_backend_name: LVM_iSCSI - volume_driver: cinder.volume.drivers.lvm.LVMVolumeDriver - volume_group: cinder-volumes - iscsi_ip_address: "{{ cinder_storage_address }}" diff --git a/tests/inventory b/tests/inventory deleted file mode 100644 index 1089218..0000000 --- a/tests/inventory +++ /dev/null @@ -1,147 +0,0 @@ -[all] -localhost -infra1 -openstack1 -manila1 -storage1 - -[all_containers] -infra1 -openstack1 -manila1 - -[oslomsg_rpc_all] -infra1 - -[oslomsg_notify_all] -infra1 - -[rabbitmq_all] -infra1 - -[galera_all] -infra1 - -[memcached_all] -infra1 - -[service_all:children] -rabbitmq_all -galera_all -memcached_all - -[keystone_all] -openstack1 - -[glance_api] -openstack1 - -[glance_registry] -openstack1 - -[glance_all:children] -glance_api -glance_registry - -[neutron_agent] -openstack1 - -[neutron_dhcp_agent] -openstack1 - -[neutron_linuxbridge_agent] -storage1 -openstack1 - -[neutron_openvswitch_agent] - -[neutron_metering_agent] -openstack1 - -[neutron_l3_agent] -openstack1 - -[neutron_metadata_agent] -openstack1 - -[neutron_server] -openstack1 - -[neutron_all:children] -neutron_agent -neutron_dhcp_agent -neutron_linuxbridge_agent -neutron_openvswitch_agent -neutron_metering_agent -neutron_l3_agent -neutron_metadata_agent -neutron_server - -[nova_api_metadata] -openstack1 - -[nova_api_os_compute] -openstack1 - -[nova_compute] -storage1 - -[nova_conductor] -openstack1 - -[nova_console] -openstack1 - -[nova_scheduler] -openstack1 - -[nova_api_placement] -openstack1 - -[nova_all:children] -nova_api_metadata -nova_api_os_compute -nova_compute -nova_conductor -nova_console -nova_scheduler -nova_api_placement - -[cinder_api] -infra1 - -[cinder_scheduler] -infra1 - -[cinder_backup] -infra1 - -[cinder_volume] -storage1 - -[cinder_all:children] -cinder_api -cinder_scheduler -cinder_backup -cinder_volume - -[utility_all] -infra1 - -[manila_api] -manila1 - -[manila_scheduler] -manila1 - -[manila_data] -manila1 - -[manila_share] -storage1 - -[manila_all:children] -manila_api -manila_scheduler -manila_data -manila_share diff --git a/tests/os_manila-overrides.yml b/tests/os_manila-overrides.yml deleted file mode 100644 index d0f723c..0000000 --- a/tests/os_manila-overrides.yml +++ /dev/null @@ -1,137 +0,0 @@ ---- -# Copyright 2019, Rackspace US, Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -tempest_run: yes -tempest_test_whitelist: - - smoke - - manila_tempest_tests.tests.scenario.test_share_basic_ops - -tempest_test_blacklist: - - test: tempest.api.identity - reason: Reducing run time and required resources - - test: tempest.api.image - reason: Reducing run time and required resources - - test: tempest.api.compute - reason: Reducing run time and required resources - - test: tempest.api.network - reason: Reducing run time and required resources - - test: tempest.api.volume - reason: Reducing run time and required resources - - test: tempest.scenario.test_server_basic_ops - reason: Reducing run time and required resources - - test: tempest.scenario.test_network_basic_ops - reason: Reducing run time and required resources - -tempest_plugins: "{{ _tempest_plugins['keystone'] + _tempest_plugins['manila'] }}" - -tempest_tempest_conf_overrides: - share: - image_with_share_tools: manila-service-image - image_password: manila - enable_protocols: nfs - enable_ip_rules_for_protocols: nfs - enable_ro_access_level_for_protocols: nfs - suppress_errors_in_cleanup: true - share_creation_retry_number: 3 - run_ipv6_tests: False - -tempest_images: - - url: "http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img" - checksum: "sha256:e137062a4dfbb4c225971b67781bc52183d14517170e16a3841d16f962ae7470" - format: "qcow2" - name: "cirros" - - url: "http://tarballs.openstack.org/manila-image-elements/images/manila-service-image-master.qcow2" - format: "qcow2" - name: "manila-service-image" - -tempest_flavors: - - name: tempest1 - id: 201 - ram: 256 - disk: 1 - vcpus: 1 - - name: tempest2 - id: 202 - ram: 512 - disk: 1 - vcpus: 1 - - name: manila-service-flavor - id: 100 - ram: 256 - disk: 2 - vcpus: 1 - -neutron_provider_networks: - network_types: "vxlan,flat" - network_mappings: "flat:eth12" - network_vxlan_ranges: "1:1000" - -manila_default_share_type: nfs-share1 -manila_protocols: - - NFS - - CIFS - - CEPHFS - -manila_backends: - nfs-share1: - share_backend_name: NFS_SHARE1 - share_driver: manila.share.drivers.lvm.LVMShareDriver - driver_handles_share_servers: False - lvm_share_volume_group: manila-shares - lvm_share_export_ips: "10.1.1.1" - filter_function: "share.size >= 0" - goodness_function: "share.size >= 0" - generic: - share_backend_name: GENERIC - share_driver: manila.share.drivers.generic.GenericShareDriver - driver_handles_share_servers: True - service_instance_flavor_id: 100 - service_image_name: manila-service-image - service_instance_user: manila - service_instance_password: manila - interface_driver: manila.network.linux.interface.BridgeInterfaceDriver - filter_function: "share.size >= 0" - goodness_function: "share.size >= 0" - -test_manila_api_group: "{{ ((groups['manila_api'] is defined) and (groups['manila_api'] | length > 0)) | ternary('manila_api', 'all_containers') }}" -test_manila_share_group: "{{ ((groups['manila_share'] is defined) and (groups['manila_share'] | length > 0)) | ternary('manila_share', 'all_containers') }}" -test_manila_api_host: "{{ hostvars[groups[test_manila_api_group][0]]['ansible_host'] }}" -test_manila_share_host: "{{ hostvars[groups[test_manila_share_group][0]]['ansible_host'] }}" -manila_container_mysql_password: "SuperSecrete" -manila_git_install_branch: "{{ test_branch }}" -manila_profiler_hmac_key: "secrete" -manila_oslomsg_rpc_password: "secrete" -manila_oslomsg_notify_password: "{{ oslomsg_notify_password }}" -manila_service_password: "secrete" -manila_venv_tag: "testing" -manila_service_port: 8786 -manila_service_proto: http -manila_service_publicuri: "{{ manila_service_proto }}://{{ test_manila_api_host }}:{{ manila_service_port }}" -manila_service_publicurl: "{{ manila_service_publicuri }}/v1/%(tenant_id)s" -manila_service_adminuri: "{{ manila_service_proto }}://{{ test_manila_api_host }}:{{ manila_service_port }}" -manila_service_adminurl: "{{ manila_service_adminuri }}/v1/%(tenant_id)s" -manila_service_internaluri: "{{ manila_service_proto }}://{{ test_manila_api_host }}:{{ manila_service_port }}" -manila_service_internalurl: "{{ manila_service_internaluri }}/v1/%(tenant_id)s" -manila_service_v2_port: 8786 -manila_service_v2_proto: http -manila_service_v2_publicuri: "{{ manila_service_v2_proto }}://{{ tst_manila_api_host }}:{{ manila_service_v2_port }}" -manila_service_v2_publicurl: "{{ manila_service_publicuri }}/v2/%(tenant_id)s" -manila_service_v2_adminuri: "{{ manila_service_v2_proto }}://{{ test_manila_api_host }}:{{ manila_service_v2_port }}" -manila_service_v2_adminurl: "{{ manila_service_adminuri }}/v2/%(tenant_id)s" -manila_service_v2_internaluri: "{{ manila_service_v2_proto }}://{{ test_manila_api_host }}:{{ manila_service_v2_port }}" -manila_service_v2_internalurl: "{{ manila_service_internaluri }}/v2/%(tenant_id)s" -tempest_service_available_manila: "{{ ((groups['manila_all'] is defined) and (groups['manila_all'] | length > 0)) }}" -manila_osapi_share_workers: 2 -manila_wsgi_processes: 2 diff --git a/tests/test-install-manila.yml b/tests/test-install-manila.yml deleted file mode 100644 index d6d4781..0000000 --- a/tests/test-install-manila.yml +++ /dev/null @@ -1,34 +0,0 @@ ---- -# Copyright 2019, Rackspace US, Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -- name: Deploy manila API services - hosts: manila_api - remote_user: root - gather_facts: true - any_errors_fatal: true - vars_files: - - common/test-vars.yml - roles: - - role: "os_manila" - -- name: Deploy the rest of manila - hosts: "manila_all:!manila_api" - remote_user: root - gather_facts: true - any_errors_fatal: true - vars_files: - - common/test-vars.yml - roles: - - role: "os_manila" diff --git a/tests/test-setup-manila-localhost.yml b/tests/test-setup-manila-localhost.yml deleted file mode 100644 index 539d7f6..0000000 --- a/tests/test-setup-manila-localhost.yml +++ /dev/null @@ -1,56 +0,0 @@ ---- -# Copyright 2019, Rackspace US, Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -- name: Prepare manila_shares share group - hosts: localhost - # This set of tasks runs against localhost - # and requires root access, but tests run as - # the user running the playbook (zuul). As - # such, we use a local connection and become. - connection: local - become: yes - tasks: - - name: Install lvm2 package - package: - name: lvm2 - - - name: Create sparse Manila file - command: "truncate -s {{ manila_sparse_file_size | default('10G') }} /openstack/{{ manila_sparse_file_name | default('manila') }}.img" - args: - creates: /openstack/manila.img - register: manila_create - - - name: Get a loopback device for manila file - command: losetup -f - when: manila_create is changed - register: manila_losetup - - - name: Create the loopback device - command: "losetup {{ manila_losetup.stdout }} /openstack/manila.img" - when: manila_create is changed - - - name: Make LVM physical share on the manila device - command: "{{ item }}" - when: manila_create is changed - with_items: - - "pvcreate {{ manila_losetup.stdout }}" - - "pvscan" - - - name: Add manila_shares share group - lvg: - vg: "{{ manila_lvm_vg_name | default('manila-shares') }}" - pvs: "{{ manila_losetup.stdout }}" - when: manila_create is changed - diff --git a/tests/test.yml b/tests/test.yml deleted file mode 100644 index 07a0ce0..0000000 --- a/tests/test.yml +++ /dev/null @@ -1,50 +0,0 @@ ---- -# Copyright 2019, Rackspace US, Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -# Setup the host -- import_playbook: common/test-setup-host.yml - -# Prepare the manila_share VG -- import_playbook: test-setup-manila-localhost.yml - -# Prepare the manila_share VG -- import_playbook: common/test-setup-cinder-localhost.yml - -# Install RabbitMQ/MariaDB -- import_playbook: common/test-install-infra.yml - -# Install Keystone -- import_playbook: common/test-install-keystone.yml - -# Install Glance -- import_playbook: common/test-install-glance.yml - -# Install Neutron -- import_playbook: common/test-install-neutron.yml - -# Install Nova -- import_playbook: common/test-install-nova.yml - -# Install Cinder -- import_playbook: common/test-install-cinder.yml - -# Set iSCSI InitiatorName -- import_playbook: cinder-initiator.yml - -# Install Manila -- import_playbook: test-install-manila.yml - -# Install and execute Tempest -- import_playbook: common/test-install-tempest.yml diff --git a/tox.ini b/tox.ini index 1d1390e..5d38d07 100644 --- a/tox.ini +++ b/tox.ini @@ -80,17 +80,6 @@ commands = commands = bash -c "{toxinidir}/tests/common/test-ansible-lint.sh" -[testenv:functional] -commands = - bash -c "{toxinidir}/tests/common/test-ansible-functional.sh" - -[testenv:distro_install] -setenv = - {[testenv]setenv} - ANSIBLE_PARAMETERS=-e @{toxinidir}/tests/common/test-distro_install-vars.yml -commands = - bash -c "{toxinidir}/tests/common/test-ansible-functional.sh" - [testenv:linters] commands = bash -c "{toxinidir}/tests/common/test-ansible-env-prep.sh"