Merge "install rabbitmq-server in serial"

tests/test-functional.yml

@@ -13,6 +13,13 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+- name: Run functional tests
+  hosts: rabbitmq_all
+  user: root
+  gather_facts: true
+  vars_files:
+    - test-vars.yml
+  tasks:
     - name: Check rabbitmq is running
       command: "pgrep rabbit"
       delegate_to: "{{ item }}"

tests/test-install-rabbitmq-server.yml

@@ -13,14 +13,14 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+# NOTE(mancdaz): rabbitmq cannot be upgraded in serial, so when
+# rabbitmq_upgrade=True, serial is set to 0, else it is 1 for installs
 - name: Install RabbitMQ server
   hosts: rabbitmq_all
+  serial: "{{ rabbitmq_upgrade|default(false) | bool | ternary(0, 1)}}"
   user: root
   gather_facts: true
   roles:
     - role: "{{ rolename | basename }}"
-      rabbitmq_cookie_token: secrete
-  post_tasks:
-    - include: test-functional.yml
   vars_files:
     - test-vars.yml

tests/test-vars.yml

@@ -1 +1,3 @@
 rabbitmq_cookie_token: secrete
+rabbitmq_ssl_cert: /etc/rabbitmq/rabbitmq.pem
+rabbitmq_ssl_key: /etc/rabbitmq/rabbitmq.key

tests/test.yml

@@ -25,6 +25,11 @@
 # Install RabbitMQ server
 - include: test-install-rabbitmq-server.yml
 
+# Run tests
+- include: test-functional.yml
+  vars:
+    rabbitmq_package_version: "3.6.1-1"
+
 ############################# UPGRADE TESTING #############################
 
 # Run container clean up and build
@@ -37,7 +42,18 @@
     rabbitmq_package_version: "{{ rabbitmq_package_url.split('/')[-1].split('_')[1] }}"
     rabbitmq_package_sha256: "b8a42321c2f2689dc579911fbb583bd9c4d2ce2f20003d7050d5a324a6d2de42"
 
-# Perform upgrade of RabbitMQ server
+# Run tests
+- include: test-functional.yml
+  vars:
+    rabbitmq_package_version: "3.5.7-1"
+
+# Perform upgrade of RabbitMQ server (package_version will come
+# from role defaults)
 - include: test-install-rabbitmq-server.yml
   vars:
     rabbitmq_upgrade: true
+
+# Run tests
+- include: test-functional.yml
+  vars:
+    rabbitmq_package_version: "3.6.1-1"