Postgres new version for master (#149)

* Update main.yml

* Postgres version comes from release rpms

Due to ovirt-4.2 starting to work with postgres9.5 which is not officially supported in RHEL
we need an extra reprository to get the relevant postgres version,
the repository comes from the release rpms

also removed the check if the postgres service is up,
as it is not needed - the engine setup would have failed if its not

* Postgres version comes from release rpms

Due to ovirt-4.2 starting to work with postgres9.5 which is not officially supported in RHEL
we need an extra reprository to get the relevant postgres version,
the repository comes from the release rpms

also removed the check if the postgres service is up,
as it is not needed - the engine setup would have failed if its not

* Postgres version comes from release rpms

Due to ovirt-4.2 starting to work with postgres9.5 which is not officially supported in RHEL
we need an extra reprository to get the relevant postgres version,
the repository comes from the release rpms

also removed the check if the postgres service is up,
as it is not needed - the engine setup would have failed if its not

* Postgres version comes from release rpms

Due to ovirt-4.2 starting to work with postgres9.5 which is not officially supported in RHEL
we need an extra reprository to get the relevant postgres version,
the repository comes from the release rpms

also removed the check if the postgres service is up,
as it is not needed - the engine setup would have failed if its not

Author: nellyc

roles/ovirt-common/README.md

@@ -11,6 +11,7 @@ Target Systems
 * engine
 * hypervisors
 * dwh
+* database
 
 Role Variables
 --------------

roles/ovirt-engine-remote-db/README.md

@@ -15,7 +15,7 @@ Target systems
 Requirements
 ------------
 
-Preinstalled clean operating system.
+Preinstalled clean environment with configured repositories.
 
 Role Variables
 --------------
@@ -43,8 +43,6 @@ ovirt_engine_remote_db_access:  # configure access to engine remote DBs
     address: 0.0.0.0/0   # mask for host, omitted for local
     method: md5 / trust / ident / peer
 
-ovirt_engine_remote_db_config_file: Path to postgresql configuration
-  (default: '/var/lib/pgsql/data/postgresql.conf')
 ovirt_engine_remote_db_vacuum: [True, False] True if set db configuration for
   vacuum feature (default: True)
 ovirt_engine_remote_db_vacuum_config: Default postgresql cofiguration for
@@ -54,7 +52,7 @@ ovirt_engine_remote_db_vacuum_config: Default postgresql cofiguration for
 Dependencies
 ------------
 
-None
+* ovirt-common - this is only a must on ovirt > 4.1
 
 Example Playbook
 ----------------
@@ -63,7 +61,10 @@ Example Playbook
 ---
 - hosts: database
   vars:
-  # vars for PostgreSQL
+    ovirt_engine_version: "4.2"
+    # var for ovirt-common, this is not a must for ovirt <= 4.1
+    ovirt_rpm_repo: 'http://resources.ovirt.org/pub/yum-repo/ovirt-release41.rpm'
+    # vars for PostgreSQL
     ovirt_engine_remote_db_port: 5432
     ovirt_engine_remote_db_listen_address: '*'
 
@@ -86,6 +87,8 @@ Example Playbook
         type: local
         method: md5
   roles:
+    # ovirt-common is not a must for ovirt <= 4.1
+    - ovirt-common
     - ovirt-engine-remote-db
 ```
 

roles/ovirt-engine-remote-db/defaults/main.yml

@@ -18,7 +18,6 @@ ovirt_engine_remote_db_access:
     address: 0.0.0.0/0
     method: md5
 
-ovirt_engine_remote_db_config_file: "/var/lib/pgsql/data/postgresql.conf"
 ovirt_engine_remote_db_vacuum: true
 ovirt_engine_remote_db_vacuum_config:
   'autovacuum_vacuum_scale_factor': 0.01

roles/ovirt-engine-remote-db/tasks/main.yml

@@ -2,6 +2,15 @@
 # main file for remote DB task
 # based on https://fedoraproject.org/wiki/PostgreSQL
 
+- name: Include postgres params
+  include_vars: default.yml
+
+- name: Override postgres params for CentOs or Red Hat when ovirt >= 4.2
+  include_vars: postgres95.yml
+  when:
+    - ovirt_engine_version >= '4.2'
+    - ansible_distribution in ('CentOS', 'Red Hat')
+
 # install libselinux-python on machine - selinux policy
 - name: install SELinux requirements to run ansible modules managing SELinux.
   yum:
@@ -11,16 +20,21 @@
     - libselinux-python
     - policycoreutils-python
 
+- name: install psycopg2 requirements to run ansible modules managing postgres.
+  yum:
+    name: "python-psycopg2"
+    state: "present"
+
 - name: check PostgreSQL service
   service:
-    name: postgresql
+    name: "{{ postgres_service_name }}"
     state: started
   register: postgresql_status
   ignore_errors: True
 
 - name: yum install PostgreSQL
   yum:
-    name: "postgresql-server"
+    name: "{{ postgres_server }}"
     state: installed
     update_cache: yes
   when: postgresql_status|failed
@@ -33,26 +47,43 @@
     line: 'Defaults    !requiretty'
   when: postgresql_status|failed
 
-- name: run PostgreSQL initdb
+- name: scl enable
+  shell: 'scl enable rh-postgresql95 bash'
+  when:
+    - postgresql_status|failed
+    - ovirt_engine_version >= '4.2'
+    - ansible_distribution in ('CentOS', 'Red Hat')
+  tags:
+    - skip_ansible_lint
+
+- name: run PostgreSQL DB config
   become_user: postgres
   become: yes
-  shell: '/usr/bin/initdb -D /var/lib/pgsql/data'
+  shell: '{{ postgres_setup_cmd }}'
   args:
-    creates: "/var/lib/pgsql/data/postgresql.conf"
-  when: postgresql_status|failed
+    creates: "{{ postgres_config_file }}"
+  when: ovirt_engine_version < '4.2'
+  tags:
+    - skip_ansible_lint
+
+- name: run PostgreSQL DB config
+  shell: '{{ postgres_setup_cmd }}'
+  args:
+    creates: "{{ postgres_config_file }}"
+  when: ovirt_engine_version >= '4.2'
   tags:
     - skip_ansible_lint
 
 - name: start PostgreSQL service
   service:
-    name: postgresql
+    name: "{{ postgres_service_name }}"
     state: started
     enabled: yes
 
 # allow access engine database access from outside
 - name: "update pg_hba.conf to allow connection for ovirt_engine_remote_db"
   lineinfile:
-    dest: '/var/lib/pgsql/data/pg_hba.conf'
+    dest: '{{ postgres_data_dir }}/pg_hba.conf'
     line: >
       {{ item.type }} {{ ovirt_engine_db_name }} {{ ovirt_engine_db_user }}
       {{ item.address | default(' ') }} {{ item.method }}
@@ -63,7 +94,7 @@
 # allow access engine dwh database access from outside
 - name: "update pg_hba.conf to allow connection for ovirt_engine_dwh_remote_db"
   lineinfile:
-    dest: '/var/lib/pgsql/data/pg_hba.conf'
+    dest: '{{ postgres_data_dir }}/pg_hba.conf'
     line: >
       {{ item.type }} {{ ovirt_engine_dwh_db_name }}
       {{ ovirt_engine_dwh_db_user }} {{ item.address | default(' ') }}
@@ -75,7 +106,7 @@
 # listen on specific address
 - name: update postgresql.conf -> listen_addresses='*'
   lineinfile:
-    dest: "{{ ovirt_engine_remote_db_config_file }}"
+    dest: "{{ postgres_config_file }}"
     regexp: "^listen_addresses *=.*$"
     line: "listen_addresses='{{ovirt_engine_remote_db_listen_address}}'"
     insertafter: EOF
@@ -84,7 +115,7 @@
 # listen on specific port
 - name: update postgresql.conf -> port number
   lineinfile:
-    dest: "{{ ovirt_engine_remote_db_config_file }}"
+    dest: "{{ postgres_config_file }}"
     regexp: "^port *=.*$"
     line: "port={{ ovirt_engine_remote_db_port }}"
     insertafter: EOF
@@ -97,7 +128,7 @@
 #    - Environment=PGPORT=5432
 - name: update postgresql.conf -> port number in service file (Fedora & RHEL)
   lineinfile:
-    dest: '/usr/lib/systemd/system/postgresql.service'
+    dest: '/usr/lib/systemd/system/{{ postgres_service_name }}.service'
     backrefs: yes
     regexp: "^Environment=PGPORT *=.*$"
     line: "Environment=PGPORT={{ ovirt_engine_remote_db_port }}"
@@ -125,7 +156,7 @@
 # Required for vacuum feature
 - name: set vacuum configuration for postgresql
   ini_file:
-    path: "{{ ovirt_engine_remote_db_config_file }}"
+    path: "{{ postgres_config_file }}"
     option: "{{ item.key }}"
     value: "{{ item.value }}"
     section: null
@@ -145,7 +176,7 @@
 # first check of PostgreSQL - if fail, setup
 - name: PostgreSQL reload configuration
   service:
-    name: postgresql
+    name: "{{ postgres_service_name }}"
     state: restarted
 
 - name: check iptables service
@@ -189,45 +220,39 @@
   tags:
     - skip_ansible_lint
 
-- name: creating directory for sql scripts in /tmp/ansible-sql
-  file:
-    path: /tmp/ansible-sql
-    state: directory
-
-- name: copy SQL scripts
-  template:
-    src: "{{item}}.j2"
-    dest: "/tmp/ansible-sql/{{item}}"
-    mode: 0644
-    owner: postgres
-    group: postgres
-  with_items:
-    - "ovirt-engine-db-create.sql"
-    - "ovirt-engine-db-user-create.sql"
-    - "ovirt-engine-dwh-db-create.sql"
-    - "ovirt-engine-dwh-db-user-create.sql"
-
-- name: create engine DB and user
+- name: create DWH DB user
+  become: true
   become_user: postgres
-  become: yes
-  command: psql -p {{ovirt_engine_remote_db_port}} -a -f /tmp/ansible-sql/'{{item}}'
+  postgresql_user:
+    name: "{{ item.user }}"
+    password: "{{ item.password }}"
   with_items:
-    - "ovirt-engine-db-user-create.sql"
-    - "ovirt-engine-db-create.sql"
-  when: ovirt_engine_remote_db == True
+    - user: "{{ ovirt_engine_db_user }}"
+      password: "{{ ovirt_engine_db_password }}"
+    - user: "{{ ovirt_engine_dwh_db_user }}"
+      password: "{{ ovirt_engine_dwh_db_password }}"
+  when: ovirt_engine_dwh_remote_db == True
 
-- name: create engine DWH DB and user
+- name: create engine & DWH DBs
+  become: true
   become_user: postgres
-  become: yes
-  command: psql -p {{ovirt_engine_remote_db_port}} -a -f /tmp/ansible-sql/'{{item}}'
+  postgresql_db:
+    name: "{{ item.db_name }}"
+    owner: "{{ item.user }}"
+    encoding: UTF-8
+    lc_collate: en_US.UTF-8
+    lc_ctype: en_US.UTF-8
+    template: template0
   with_items:
-    - "ovirt-engine-dwh-db-user-create.sql"
-    - "ovirt-engine-dwh-db-create.sql"
+    - db_name: "{{ ovirt_engine_db_name }}"
+      user: "{{ ovirt_engine_db_user }}"
+    - db_name: "{{ ovirt_engine_dwh_db_name }}"
+      user: "{{ ovirt_engine_dwh_db_user }}"
   when: ovirt_engine_dwh_remote_db == True
 
 - name: check PostgreSQL service
   service:
-    name: postgresql
+    name: "{{ postgres_service_name }}"
     state: started
     enabled: yes
 

roles/ovirt-engine-remote-db/templates/ovirt-engine-db-create.sql.j2

@@ -0,0 +1,6 @@
+---
+postgres_service_name: "postgresql"
+postgres_server: "postgresql-server"
+postgres_data_dir: "/var/lib/pgsql/data"
+postgres_config_file: "/var/lib/pgsql/data/postgresql.conf"
+postgres_setup_cmd: "/usr/bin/initdb  -D /var/lib/pgsql/data"

roles/ovirt-engine-remote-db/templates/ovirt-engine-db-user-create.sql.j2

@@ -0,0 +1,6 @@
+---
+postgres_service_name: "rh-postgresql95-postgresql"
+postgres_server: "rh-postgresql95-postgresql-server"
+postgres_data_dir: "/var/opt/rh/rh-postgresql95/lib/pgsql/data"
+postgres_config_file: "/var/opt/rh/rh-postgresql95/lib/pgsql/data/postgresql.conf"
+postgres_setup_cmd: "/opt/rh/rh-postgresql95/root/usr/bin/postgresql-setup --initdb"

roles/ovirt-engine-remote-db/templates/ovirt-engine-dwh-db-create.sql.j2

@@ -44,12 +44,6 @@
   tags:
     - skip_ansible_lint
 
-- name: check state of database
-  service:
-    name: postgresql
-    state: started
-  when: (ovirt_engine_dwh_db_host == 'localhost' and ovirt_engine_dwh == True) or ovirt_engine_db_host == 'localhost'
-
 - name: check state of engine
   service:
     name: ovirt-engine

roles/ovirt-engine-remote-db/templates/ovirt-engine-dwh-db-user-create.sql.j2

@@ -0,0 +1,19 @@
+---
+- name: Deploy node for ovirt-engine remote DB
+  hosts: remote-db
+  vars:
+    ovirt_engine_version: "{{ ovirt_engine_version }}"
+    ovirt_rpm_repo: "{{ ovirt_rpm_repo }}"
+    ovirt_engine_remote_db: true
+    ovirt_engine_dwh_remote_db: true
+    ovirt_engine_remote_db_access:
+      -
+        type: host
+        address: 0.0.0.0/0
+        method: md5
+      -
+        type: local
+        method: trust
+  roles:
+    - role: ovirt-common
+    - role: ovirt-engine-remote-db

roles/ovirt-engine-remote-db/vars/default.yml

@@ -2,6 +2,7 @@
 - include: containers-deploy.yml
 - include: db-deploy.yml
   vars:
+    ovirt_engine_version: "3.6"
     ovirt_engine_remote_db_vacuum: false
 - include: engine-deploy.yml
   vars:

roles/ovirt-engine-remote-db/vars/postgres95.yml

@@ -2,6 +2,7 @@
 - include: containers-deploy.yml
 - include: db-deploy.yml
   vars:
+    ovirt_engine_version: "4.0"
     ovirt_engine_remote_db_vacuum: false
 - include: engine-deploy.yml
   vars:

roles/ovirt-engine-setup/tasks/main.yml

@@ -1,6 +1,8 @@
 ---
 - include: containers-deploy.yml
 - include: db-deploy.yml
+  vars:
+    ovirt_engine_version: "4.1"
 - include: engine-deploy.yml
   vars:
     ovirt_engine_version: "4.1"

tests/db-deploy-master.yml

@@ -1,6 +1,9 @@
 ---
 - include: containers-deploy.yml
-- include: db-deploy.yml
+- include: db-deploy-master.yml
+  vars:
+    ovirt_engine_version: "4.2"
+    ovirt_rpm_repo: "http://plain.resources.ovirt.org/pub/yum-repo/ovirt-release-master.rpm"
 - include: engine-deploy.yml
   vars:
     ovirt_engine_version: "4.2"

tests/test-3.6.yml

@@ -1,6 +1,8 @@
 ---
 - include: containers-deploy.yml
 - include: db-deploy.yml
+  vars:
+    ovirt_engine_version: "4.0"
 - include: engine-deploy.yml
   vars:
     ovirt_engine_version: "4.0"

tests/test-4.0.yml

@@ -1,6 +1,8 @@
 ---
 - include: containers-deploy.yml
 - include: db-deploy.yml
+  vars:
+    ovirt_engine_version: "4.1"
 - include: engine-deploy.yml
   vars:
     ovirt_engine_version: "4.1"