new role for changing engine from local to remote db

.travis.yml

@@ -15,8 +15,9 @@ env:
     - TEST_NAME=4.0
     - TEST_NAME=4.1
     - TEST_NAME=master
-    - TEST_NAME=upgrade-4.1-to-master
     - TEST_NAME=upgrade-4.0-to-4.1
+    - TEST_NAME=upgrade-4.1-to-master
+    - TEST_NAME=promote-db-local-to-remote
 
 # Install python-pip
 addons:

tests/containers-deploy.yml

@@ -7,13 +7,9 @@
       provision_docker_inventory_group: "{{ groups['remote-db'] }}"
     - role: provision_docker
       provision_docker_inventory_group: "{{ groups['engine'] }}"
-    - role: provision_docker
-      provision_docker_inventory_group: "{{ groups['engine-local-db'] }}"
-    - role: provision_docker
-      provision_docker_inventory_group: "{{ groups['remote-db-migrate'] }}"
 
 - name: "Update python because of ovirt-imageio-proxy"
-  hosts: engine engine-local-db
+  hosts: engine
   tasks:
     - name: Update python
       yum:

tests/engine-cleanup.yml

@@ -5,19 +5,8 @@
     ovirt_engine_type: "ovirt-engine"
     ovirt_engine_version: "{{ ovirt_engine_version }}"
     ovirt_engine_hostname: "localhost"
-    ovirt_engine_db_host: "{{ hostvars['remote_db_centos7']['ansible_default_ipv4']['address'] }}"
+    ovirt_engine_db_host: "{{ engine_db_host | default(hostvars['remote_db_centos7']['ansible_default_ipv4']['address']) }}"
     ovirt_engine_dwh: true
-    ovirt_engine_dwh_db_host: "{{ hostvars['remote_db_centos7']['ansible_default_ipv4']['address'] }}"
-  roles:
-    - role: ovirt-engine-cleanup  # This role must be last
-- name: Run ovirt-engine-cleanup on engine with local db
-  hosts: engine-local-db
-  vars:
-    ovirt_engine_type: "ovirt-engine"
-    ovirt_engine_version: "{{ ovirt_engine_version }}"
-    ovirt_engine_hostname: "localhost"
-    ovirt_engine_db_host: "localhost"
-    ovirt_engine_dwh: true
-    ovirt_engine_dwh_db_host: "localhost"
+    ovirt_engine_dwh_db_host: "{{ engine_dwh_db_host | hostvars['remote_db_centos7']['ansible_default_ipv4']['address']) }}"
   roles:
     - role: ovirt-engine-cleanup  # This role must be last

tests/engine-deploy.yml

@@ -8,9 +8,9 @@
     ovirt_engine_hostname: "localhost"
     ovirt_engine_organization: "example.com"
     ovirt_engine_admin_password: "123456"
-    ovirt_engine_db_host: "{{ hostvars['remote_db_centos7']['ansible_default_ipv4']['address'] }}"
+    ovirt_engine_db_host: "{{ engine_db_host | default(hostvars['remote_db_centos7']['ansible_default_ipv4']['address']) }}"
     ovirt_engine_dwh: true
-    ovirt_engine_dwh_db_host: "{{ hostvars['remote_db_centos7']['ansible_default_ipv4']['address'] }}"
+    ovirt_engine_dwh_db_host: "{{ engine_dwh_db_host | default(hostvars['remote_db_centos7']['ansible_default_ipv4']['address']) }}"
     ovirt_engine_configure_iso_domain: true
     ovirt_engine_firewall_manager: null
     ovirt_engine_config:

tests/inventory

@@ -3,17 +3,11 @@ localhost ansible_connection=local ansible_python_interpreter="/usr/bin/env pyth
 [engine]
 engine_centos7 image="chrismeyers/centos7"
 
-[remote-db]
-remote_db_centos7 image="chrismeyers/centos7"
-
-[engine-local-db]
-engine_centos7 image="chrismeyers/centos7"
-
-[engine-local-db:vars]
+[engine:vars]
 ovirt_type=engine
 
-[remote-db-migrate]
+[remote-db]
 remote_db_centos7 image="chrismeyers/centos7"
 
-[remote-db-migrate:vars]
+[remote-db:vars]
 ovirt_type=remote_db

tests/engine-local-to-remote-db.yml → tests/promote-db-local-to-remote.yml

@@ -1,5 +1,5 @@
 ---
 - name: Change engines local to remote db
-  hosts: engine-local-db remote-db-migrate
+  hosts: engine remote-db
   roles:
     - role: ovirt-engine-local-to-remote-db

tests/test-promote-db-local-to-remote.yml

@@ -0,0 +1,16 @@
+---
+- include: containers-deploy.yml
+- include: engine-deploy.yml
+  vars:
+    engine_db_host: "localhost"
+    engine_dwh_db_host: "localhost"
+    ovirt_engine_version: "4.1"
+    ovirt_rpm_repo: "http://plain.resources.ovirt.org/pub/yum-repo/ovirt-release41.rpm"
+
+- include: promote-db-local-to-remote.yml
+
+- include: engine-cleanup.yml
+  vars:
+    engine_db_host: "localhost"
+    engine_dwh_db_host: "localhost"
+    ovirt_engine_version: "4.1"