Updates to vbox-* playbooks

Author: oravirt

vbox-rac-dc1.yml

@@ -1,69 +1,75 @@
----
- - name: Host configuration
-   hosts: vbox-rac-dc1
-   user: vagrant
-   become: yes
-   roles:
-      - common
-      - orahost
 
- - name: ssh configuration
-   hosts: vbox-rac-dc1
-   user: vagrant
-   become: yes
-   serial: 1
-   roles:
-      - {role: orahost-ssh, when: configure_cluster and not old_ssh_config}
+- name: Host configuration
+  hosts: vbox-rac-dc1
+  user: vagrant
+  become: yes
+  roles:
+     - common
+     - orahost
 
- - name: Storage Configuration
-   hosts: vbox-rac-dc1
-   user: vagrant
-   become: yes
-   roles:
-      - orahost-storage
+- name: ssh configuration
+  hosts: vbox-rac-dc1
+  user: vagrant
+  become: yes
+  serial: 1
+  roles:
+     - {role: orahost-ssh, when: configure_cluster and not old_ssh_config}
 
- - name: Oracle Grid Infrastructure installation
-   hosts: vbox-rac-dc1
-   user: vagrant
-   become: yes
-   roles:
-      - oraswgi-install
+- name: Storage Configuration
+  hosts: vbox-rac-dc1
+  user: vagrant
+  become: yes
+  roles:
+     - orahost-storage
 
- - name: ASM Configuration, Database Server Installation & Database Creation
-   hosts: vbox-rac-dc1
-   user: vagrant
-   become: yes
-   roles:
-      - oraasm-createdg
-      - oraswdb-install
-      - oradb-manage-db
+- name: Oracle Grid Infrastructure installation
+  hosts: vbox-rac-dc1
+  user: vagrant
+  become: yes
+  roles:
+     - oraswgi-install
 
- - name: Install cx_oracle
-   hosts: vbox-rac-dc1
-   user: vagrant
-   become: yes
-   roles:
-      - cxoracle
+- name: Install cx_oracle
+  hosts: vbox-rac-dc1
+  user: vagrant
+  become: yes
+  roles:
+     - cxoracle
 
- - name: Configure Logrotate
-   hosts: vbox-rac-dc1
-   user: vagrant
-   become: yes
-   roles:
-      - orahost-logrotate
+- name: ASM Diskgroup configuration
+  hosts: vbox-rac-dc1
+  user: vagrant
+  become: yes
+  roles:
+     - {role: oraasm-createdg, when: old_diskgroup_config}
+     - {role: oraasm-manage-diskgroups, when: not old_diskgroup_config}
 
 
+- name: Database Server Installation & Database Creation
+  hosts: vbox-rac-dc1
+  user: vagrant
+  become: yes
+  roles:
+     - oraswdb-install
+     - oradb-manage-db
 
- - name: Customize database
-   hosts: vbox-rac-dc1
-   user: vagrant
-   sudo: yes
-   roles:
-      - oradb-manage-pdb
-      - oradb-manage-tablespace
-      - oradb-manage-parameters
-      - oradb-manage-services
-      - oradb-manage-roles
-      - oradb-manage-users
-      - oradb-manage-grants
+- name: Configure Logrotate
+  hosts: vbox-rac-dc1
+  user: vagrant
+  become: yes
+  roles:
+     - orahost-logrotate
+
+- name: Customize database
+  hosts: vbox-rac-dc1
+  user: vagrant
+  sudo: yes
+  roles:
+     - oradb-manage-pdb
+     - oradb-manage-tablespace
+     - oradb-manage-parameters
+     - oradb-manage-services
+     - oradb-manage-roles
+     - oradb-manage-users
+     - oradb-manage-grants
 

vbox-si-asm-install.yml

@@ -10,28 +10,35 @@
      - orahost
      - orahost-storage
 
-- name: Oracle Grid Infrastructure installation & ASM Configuration
+- name: Oracle Grid Infrastructure installation 
   hosts: vbox-si-asm
   user: vagrant
   become: yes
   roles:
      - oraswgi-install
-     - oraasm-createdg
 
-- name: Database Server Installation & Database Creation
+- name: Install cx_oracle
   hosts: vbox-si-asm
   user: vagrant
   become: yes
   roles:
-      - oraswdb-install
-      - oradb-manage-db
+     - cxoracle
 
-- name: Install cx_oracle
+- name: ASM Diskgroup configuration
   hosts: vbox-si-asm
   user: vagrant
   become: yes
   roles:
-     - cxoracle
+     - {role: oraasm-createdg, when: old_diskgroup_config}
+     - {role: oraasm-manage-diskgroups, when: not old_diskgroup_config}
+
+- name: Database Server Installation & Database Creation
+  hosts: vbox-si-asm
+  user: vagrant
+  become: yes
+  roles:
+      - oraswdb-install
+      - oradb-manage-db
 
 - name: Configure Logrotate
   hosts: vbox-si-asm

vbox-si-fs-install.yml

@@ -30,3 +30,16 @@
   become: yes
   roles:
      - orahost-logrotate
+
+- name: Customize database(s)
+  hosts: vbox-si-fs
+  user: vagrant
+  become: yes
+  roles:
+     - oradb-manage-pdb
+     - oradb-manage-tablespace
+     - oradb-manage-parameters
+     - oradb-manage-roles
+     - oradb-manage-users
+     - oradb-manage-grants
+     - oradb-manage-services