Skip to content

Commit b9460ba

Browse files
oravirtoravirt
committed
A bit of refactoring
1 parent be6efa3 commit b9460ba

File tree

11 files changed

+50
-38
lines changed

11 files changed

+50
-38
lines changed

‎oraasm-configureasm/tasks/main.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22

33
- name: ASMCA | Create script to configure the ASM-instance
4-
template: src=asmca-configureasm.sh.j2 dest="{{ oracle_rsp_stage }}/asmca-configureasm.sh" owner={{ grid_user }} group={{ oracle_group }} mode=744 backup=yes
4+
template: src=asmca-configureasm.sh.j2 dest="{{ oracle_rsp_stage }}/asmca-configureasm.sh" owner={{ grid_install_user }} group={{ oracle_group }} mode=744 backup=yes
55
when: master_node and oracle_install_option_gi == 'HA_CONFIG'
66
tags: asmcaha
77

‎oraasm-createdg/defaults/main.yml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,15 @@
11
---
22

3+
oracle_user: oracle
4+
grid_user: grid
5+
grid_install_user: "{% if role_separation==true %}{{ grid_user }}{% else %}{{ oracle_user }}{% endif %}"
6+
oracle_group: oinstall
7+
oracle_base: /u01/app/oracle
38
oracle_home_gi: "{% if configure_cluster==True %}{{ oracle_home_gi_cl }}{% else %}{{ oracle_home_gi_so }}{% endif %}"
49
oracle_home_gi_cl: "/u01/app/{{ oracle_install_version_gi }}/grid" # ORACLE_HOME for Grid Infrastructure (Clustered)
510
oracle_home_gi_so: "{{ oracle_base }}/{{ oracle_install_version_gi }}/grid" # ORACLE_HOME for Grid Infrastructure (Stand Alone)
11+
oracle_stage: /u01/stage
12+
oracle_rsp_stage: "{{ oracle_stage }}/rsp"
13+
oracle_stage_remote: "{{ oracle_stage }}"
614
device_persistence: asmlib
715
oracle_asm_disk_string: "{% if device_persistence == 'asmlib' %}{% elif device_persistence == 'udev' %}/dev/oracle/{% else %}{% endif %}"

‎oraasm-createdg/tasks/main.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22

33
- name: ASMCA | Create script to build asm-diskgroups
4-
template: src=asmca-createdg.sh.j2 dest="{{ oracle_rsp_stage }}/asmca-createdg-{{ item }}.sh" owner="{{ grid_user }}" group={{ oracle_group }} mode=744 backup=yes
4+
template: src=asmca-createdg.sh.j2 dest="{{ oracle_rsp_stage }}/asmca-createdg-{{ item }}.sh" owner="{{ grid_install_user }}" group={{ oracle_group }} mode=744 backup=yes
55
with_items: asm_diskgroups
66
when: master_node and item != oracle_asm_init_dg
77
tags: asmca
@@ -10,7 +10,7 @@
1010
shell: "{{ oracle_rsp_stage }}/asmca-createdg-{{ item }}.sh"
1111
with_items: asm_diskgroups
1212
sudo: yes
13-
sudo_user: "{{ grid_user }}"
13+
sudo_user: "{{ grid_install_user }}"
1414
when: master_node and item != oracle_asm_init_dg
1515
ignore_errors: True
1616
tags: asmca
@@ -25,7 +25,7 @@
2525
shell: "{{ oracle_home_gi }}/bin/srvctl status diskgroup -g {{ item }}"
2626
with_items: asm_diskgroups
2727
sudo: yes
28-
sudo_user: "{{ grid_user }}"
28+
sudo_user: "{{ grid_install_user }}"
2929
when: master_node and oracle_install_version_gi == "11.2.0.4"
3030
tags: srvctlasm
3131
register: srvctlasm
@@ -34,7 +34,7 @@
3434
shell: "{{ oracle_home_gi }}/bin/srvctl status diskgroup -diskgroup {{ item }}"
3535
with_items: asm_diskgroups
3636
sudo: yes
37-
sudo_user: "{{ grid_user }}"
37+
sudo_user: "{{ grid_install_user }}"
3838
when: master_node and oracle_install_version_gi != "11.2.0.4"
3939
tags: srvctlasm
4040
register: srvctlasm

‎orahost-storage/defaults/main.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@
55
oracle_stage: /u01/stage
66
oracle_rsp_stage: "{{ oracle_stage }}/rsp"
77
oracle_user: oracle
8-
grid_user: "{% if role_separation==true %}grid{% else %}oracle{% endif %}"
8+
grid_user: grid
9+
grid_install_user: "{% if role_separation==true %}{{ grid_user }}{% else %}{{ oracle_user }}{% endif %}"
910
oracle_group: oinstall
1011
asmdba_group: asmdba
1112
dba_group: dba

‎orahost-storage/templates/asm-udev-rules.rules.j2‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{% for disk in asm_storage_layout[item] %}
2-
KERNEL=="{{ disk.device.split("/")[-1] }}1", NAME="{{oracle_asm_disk_string.split("/",2)[-1] }}{{ disk.asmlabel }}", OWNER="{{ grid_user }}", GROUP={% if role_separation==True %}"{{ asmdba_group }}"{% else %}"{{ dba_group }}"{% endif %}, MODE="0660"
2+
KERNEL=="{{ disk.device.split("/")[-1] }}1", NAME="{{oracle_asm_disk_string.split("/",2)[-1] }}{{ disk.asmlabel }}", OWNER="{{ grid_install_user }}", GROUP={% if role_separation==True %}"{{ asmdba_group }}"{% else %}"{{ dba_group }}"{% endif %}, MODE="0660"
33
{% endfor %}

‎orahost-storage/templates/udev-label-device-mapping.txt.j2‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{% for disk in asm_storage_layout[item] %}
2-
{{ disk.device }} {{oracle_asm_disk_string.split("/",2)[-1] }}{{ disk.asmlabel }} {{ grid_user }} {% if role_separation==True %}{{ asmdba_group }}{% else %}{{ dba_group }}{% endif %}
2+
{{ disk.device }} {{oracle_asm_disk_string.split("/",2)[-1] }}{{ disk.asmlabel }} {{ grid_install_user }} {% if role_separation==True %}{{ asmdba_group }}{% else %}{{ dba_group }}{% endif %}
33

44
{% endfor %}

‎orahost/defaults/main.yml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,11 @@
2323

2424
role_separation: false
2525
oracle_user: oracle # User that will own the Oracle Installations.
26-
grid_user: "{% if role_separation==true %}grid{% else %}oracle{% endif %}"
26+
grid_user: grid
27+
grid_install_user: "{% if role_separation==true %}{{grid_user }}{% else %}{{ oracle_user }}{% endif %}"
2728

2829
oracle_user_home: "/home/{{ oracle_user }}" # Home directory for oracle_user. Needed for passing in ssh-keys, profiles etc
29-
grid_user_home: "/home/{{ grid_user }}" # Home directory for oracle_user. Needed for passing in ssh-keys, profiles etc
30+
grid_user_home: "/home/{{ grid_install_user }}" # Home directory for oracle_user. Needed for passing in ssh-keys, profiles etc
3031
oracle_group: oinstall # Primary group for oracle_user.
3132
oper_group: oper
3233
dba_group: dba
@@ -52,6 +53,7 @@
5253
configure_ssh: false # (true/false). Should passwordless ssh be configured between clusternodes. Only applicable to RAC-installs
5354
configure_host_disks: false # (true/false). Should the specified directories be on their on devices -> (true), or do they live in the root-filesystem (/) -> (false).
5455
# mountpoints are described in host_fs_layout
56+
configure_etc_hosts: false
5557
configure_cluster: false
5658
oracle_stage: /u01/stage
5759
oracle_rsp_stage: "{{ oracle_stage }}/rsp"

‎orahost/templates/oracleasm-configure.expect.j2‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ spawn service oracleasm configure
55
expect {
66
"Default user to own the driver interface*:"
77
{
8-
send "{{ grid_user }}\r"
8+
send "{{ grid_install_user }}\r"
99
exp_continue
1010
}
1111
"Default group to own the driver interface*:"

‎orahost/templates/oracleasm.j2‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ ORACLEASM_ENABLED=true
1111

1212
{% if role_separation==True %}
1313
# ORACLEASM_UID: Default user owning the /dev/oracleasm mount point.
14-
ORACLEASM_UID={{ grid_user }}
14+
ORACLEASM_UID={{ grid_install_user }}
1515

1616
# ORACLEASM_GID: Default group owning the /dev/oracleasm mount point.
1717
ORACLEASM_GID={{ asmdba_group }}

‎oraswdb-install/defaults/main.yml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,10 @@
33
master_node: true
44

55
oracle_user: oracle # User that will own the Oracle Installations.
6-
grid_user: "{% if role_separation==true %}grid{% else %}oracle{% endif %}"
6+
grid_user: grid
7+
grid_install_user: "{% if role_separation==true %}{{ grid_user }}{% else %}{{ oracle_user }}{% endif %}"
78
oracle_user_home: "/home/{{ oracle_user }}" # Home directory for oracle_user. Needed for passing in ssh-keys, profiles etc
8-
grid_user_home: "/home/{{ grid_user }}" # Home directory for oracle_user. Needed for passing in ssh-keys, profiles etc
9+
grid_user_home: "/home/{{ grid_install_user }}" # Home directory for oracle_user. Needed for passing in ssh-keys, profiles etc
910
oracle_group: oinstall # Primary group for oracle_user.
1011
oper_group: oper
1112
dba_group: dba # Primary group for oracle_user.

0 commit comments

Comments
 (0)