Browse Source

Merge "Updated from OpenStack Ansible Tests"

Zuul 3 weeks ago
parent
commit
abfc70964e
3 changed files with 10 additions and 9 deletions
  1. 2
    2
      bindep.txt
  2. 3
    2
      run_tests.sh
  3. 5
    5
      tasks/mq_setup.yml

+ 2
- 2
bindep.txt View File

@@ -26,7 +26,7 @@
26 26
 gcc
27 27
 
28 28
 # Base requirements for Ubuntu
29
-git-core          [platform:dpkg]
29
+git-core          [platform:dpkg platform:suse]
30 30
 libssl-dev        [platform:dpkg]
31 31
 libffi-dev        [platform:dpkg]
32 32
 python2.7         [platform:dpkg]
@@ -38,7 +38,7 @@ python3-dev       [platform:dpkg]
38 38
 
39 39
 # Base requirements for RPM distros
40 40
 gcc-c++           [platform:rpm]
41
-git               [platform:rpm]
41
+git               [platform:rpm !platform:suse]
42 42
 libffi-devel      [platform:rpm]
43 43
 openssl-devel     [platform:rpm]
44 44
 python-devel      [platform:rpm]

+ 3
- 2
run_tests.sh View File

@@ -1,5 +1,5 @@
1 1
 #!/usr/bin/env bash
2
-# Copyright 2019, Rackspace US, Inc.
2
+# Copyright 2015, Rackspace US, Inc.
3 3
 #
4 4
 # Licensed under the Apache License, Version 2.0 (the "License");
5 5
 # you may not use this file except in compliance with the License.
@@ -59,7 +59,8 @@ case ${ID,,} in
59 59
     *suse*) pkg_mgr_cmd="zypper -n in" ;;
60 60
     centos|rhel|fedora) pkg_mgr_cmd="${RHT_PKG_MGR} install -y" ;;
61 61
     ubuntu|debian) pkg_mgr_cmd="apt-get install -y" ;;
62
-    gentoo) pkg_mgr_cmd="emerge" ;;
62
+    # Gentoo needs to have version set since it's rolling
63
+    gentoo) pkg_mgr_cmd="emerge --jobs=4"; VERSION="rolling" ;;
63 64
     *) echo "unsupported distribution: ${ID,,}"; exit 1 ;;
64 65
 esac
65 66
 

+ 5
- 5
tasks/mq_setup.yml View File

@@ -1,5 +1,5 @@
1 1
 ---
2
-# Copyright 2019, Rackspace US, Inc.
2
+# Copyright 2018, Rackspace US, Inc.
3 3
 #
4 4
 # Licensed under the Apache License, Version 2.0 (the "License");
5 5
 # you may not use this file except in compliance with the License.
@@ -23,8 +23,8 @@
23 23
 - name: Setup RPC MQ Service (RabbitMQ)
24 24
   delegate_to: "{{ _oslomsg_rpc_setup_host }}"
25 25
   when:
26
-    - (_oslomsg_configure_rpc | default(_oslomsg_rpc_transport is defined))
27
-    - (_oslomsg_rpc_transport is defined) and (_oslomsg_rpc_transport == 'rabbit')
26
+    - "(_oslomsg_configure_rpc | default(_oslomsg_rpc_transport is defined))"
27
+    - "(_oslomsg_rpc_transport is defined) and (_oslomsg_rpc_transport == 'rabbit')"
28 28
   tags:
29 29
     - common-rabbitmq
30 30
   block:
@@ -73,8 +73,8 @@
73 73
 - name: Setup RPC MQ Service (Qdrouterd)
74 74
   delegate_to: "{{ _oslomsg_rpc_setup_host }}"
75 75
   when:
76
-    - (_oslomsg_configure_rpc | default(_oslomsg_rpc_transport is defined))
77
-    - (_oslomsg_rpc_transport is defined) and (_oslomsg_rpc_transport == 'amqp')
76
+    - "(_oslomsg_configure_rpc | default(_oslomsg_rpc_transport is defined))"
77
+    - "(_oslomsg_rpc_transport is defined) and (_oslomsg_rpc_transport == 'amqp')"
78 78
   tags:
79 79
     - common-qdrouterd
80 80
   block:

Loading…
Cancel
Save