Skip to content

Commit 3294803

Browse files
oravirtoravirt
committed
Changes to group assigments, which should fix the issue in #57 
1 parent 5eb52f3 commit 3294803

File tree

9 files changed

+22
-128
lines changed

9 files changed

+22
-128
lines changed

‎roles/orahost/defaults/main.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
oracle_users: # Passwd :Oracle123
2222
- { username: oracle, uid: 54321, primgroup: oinstall, othergroups: "dba,asmadmin,asmdba,backupdba,dgdba,kmdba,oper", passwd: "$6$0xHoAXXF$K75HKb64Hcb/CEcr3YEj2LGERi/U2moJgsCK.ztGxLsKoaXc4UBiNZPL0hlxB5ng6GL.gyipfQOOXplzcdgvD0" }
2323
grid_users:
24-
- { username: grid, uid: 54320, primgroup: oinstall, othergroups: "asmadmin,asmdba,asmoper", passwd: "$6$0xHoAXXF$K75HKb64Hcb/CEcr3YEj2LGERi/U2moJgsCK.ztGxLsKoaXc4UBiNZPL0hlxB5ng6GL.gyipfQOOXplzcdgvD0" }
24+
- { username: grid, uid: 54320, primgroup: oinstall, othergroups: "asmadmin,asmdba,asmoper,dba", passwd: "$6$0xHoAXXF$K75HKb64Hcb/CEcr3YEj2LGERi/U2moJgsCK.ztGxLsKoaXc4UBiNZPL0hlxB5ng6GL.gyipfQOOXplzcdgvD0" }
2525

2626
firewall_service: "{% if ansible_distribution_major_version|int==6%}iptables{%elif ansible_distribution_major_version|int==7 %}firewalld{% else %}0{% endif %}"
2727
role_separation: false

‎roles/orahost/templates/oracleasm.j2‎

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,19 +9,11 @@
99
# ORACLEASM_ENABLED: 'true' means to load the driver on boot.
1010
ORACLEASM_ENABLED=true
1111

12-
{% if role_separation==True %}
1312
# ORACLEASM_UID: Default user owning the /dev/oracleasm mount point.
14-
ORACLEASM_UID={{ grid_install_user }}
13+
ORACLEASM_UID={{ grid_install_user }}
1514

1615
# ORACLEASM_GID: Default group owning the /dev/oracleasm mount point.
17-
ORACLEASM_GID={{ asmdba_group }}
18-
{% else %}
19-
# ORACLEASM_UID: Default user owning the /dev/oracleasm mount point.
20-
ORACLEASM_UID={{ oracle_user }}
21-
22-
# ORACLEASM_GID: Default group owning the /dev/oracleasm mount point.
23-
ORACLEASM_GID={{ dba_group }}
24-
{% endif %}
16+
ORACLEASM_GID={{ asmadmin_group }}
2517

2618
# ORACLEASM_SCANBOOT: 'true' means scan for ASM disks on boot.
2719
ORACLEASM_SCANBOOT=true

‎roles/oraswgi-install/defaults/main.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@
1313
grid_user_home: "/home/{{ grid_install_user }}" # Home directory for oracle_user. Needed for passing in ssh-keys, profiles etc
1414
oracle_group: oinstall # Primary group for oracle_user.
1515
oper_group: oper
16-
dba_group: dba # Primary group for oracle_user.
16+
dba_group: dba # dba
1717
asmoper_group: asmoper
18-
asmdba_group: asmdba # Primary group for oracle_user.
19-
asmadmin_group: asmadmin # Primary group for oracle_user.
18+
asmdba_group: asmdba # osdba
19+
asmadmin_group: asmadmin # osasm
2020

2121
oracle_sw_source_www: http://www/orasw # address to all software if using the get_url module when putting software on the host(s)
2222
oracle_sw_source_local: /tmp # Path to all software if using the copy module when putting software on the host(s)

‎roles/oraswgi-install/tasks/12.2.0.1.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@
7575
when: oracle_sw_image_gi_psu is defined and oracle_install_version_gi == item.version and checkgiinstall.stdout != "1"
7676

7777
- debug: msg="Ignore the failure [FATAL] [INS-40426] in output from gridSetup.sh -applyPSU"
78-
when: command_result is defined
78+
when: command_result is defined and oracle_sw_image_gi_psu is defined
7979

8080
- debug: msg={{item.stdout_lines}}
8181
with_items:

‎roles/oraswgi-install/templates/grid-install.rsp.11.2.0.3.j2‎

Lines changed: 7 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -133,39 +133,19 @@ ORACLE_HOME={{ oracle_home_gi }}
133133
# The DBA_GROUP is the OS group which is to be granted OSDBA privileges.
134134
#-------------------------------------------------------------------------------
135135

136-
{% if role_separation==True %}
137-
#
138136
oracle.install.asm.OSDBA={{ asmdba_group }}
139137

140-
#-------------------------------------------------------------------------------
141-
# The OPER_GROUP is the OS group which is to be granted OSOPER privileges.
142-
# The value to be specified for OSOPER group is optional.
143-
#-------------------------------------------------------------------------------
144-
oracle.install.asm.OSOPER={{ asmoper_group }}
145-
146-
#-------------------------------------------------------------------------------
147-
# The OSASM_GROUP is the OS group which is to be granted OSASM privileges. This
148-
# must be different than the previous two.
149-
#-------------------------------------------------------------------------------
150-
oracle.install.asm.OSASM={{ asmadmin_group }}
151-
152-
{% else %}
153-
154-
oracle.install.asm.OSDBA={{ dba_group }}
155-
156-
#-------------------------------------------------------------------------------
138+
##-------------------------------------------------------------------------------
157139
## The OPER_GROUP is the OS group which is to be granted OSOPER privileges.
158140
## The value to be specified for OSOPER group is optional.
159141
##-------------------------------------------------------------------------------
160-
oracle.install.asm.OSOPER={{ oper_group }}
161-
142+
oracle.install.asm.OSOPER={{ asmoper_group }}
143+
#
162144
##-------------------------------------------------------------------------------
163-
# The OSASM_GROUP is the OS group which is to be granted OSASM privileges. This
164-
# must be different than the previous two.
165-
#-------------------------------------------------------------------------------
166-
oracle.install.asm.OSASM={{ dba_group }}
167-
168-
{% endif %}
145+
## The OSASM_GROUP is the OS group which is to be granted OSASM privileges. This
146+
## must be different than the previous two.
147+
##-------------------------------------------------------------------------------
148+
oracle.install.asm.OSASM={{ asmadmin_group }}
169149

170150
################################################################################
171151
# #

‎roles/oraswgi-install/templates/grid-install.rsp.11.2.0.4.j2‎

Lines changed: 7 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -133,39 +133,19 @@ ORACLE_HOME={{ oracle_home_gi }}
133133
# The DBA_GROUP is the OS group which is to be granted OSDBA privileges.
134134
#-------------------------------------------------------------------------------
135135

136-
{% if role_separation==True %}
137-
#
138136
oracle.install.asm.OSDBA={{ asmdba_group }}
139137

140-
#-------------------------------------------------------------------------------
141-
# The OPER_GROUP is the OS group which is to be granted OSOPER privileges.
142-
# The value to be specified for OSOPER group is optional.
143-
#-------------------------------------------------------------------------------
144-
oracle.install.asm.OSOPER={{ asmoper_group }}
145-
146-
#-------------------------------------------------------------------------------
147-
# The OSASM_GROUP is the OS group which is to be granted OSASM privileges. This
148-
# must be different than the previous two.
149-
#-------------------------------------------------------------------------------
150-
oracle.install.asm.OSASM={{ asmadmin_group }}
151-
152-
{% else %}
153-
154-
oracle.install.asm.OSDBA={{ dba_group }}
155-
156-
#-------------------------------------------------------------------------------
138+
##-------------------------------------------------------------------------------
157139
## The OPER_GROUP is the OS group which is to be granted OSOPER privileges.
158140
## The value to be specified for OSOPER group is optional.
159141
##-------------------------------------------------------------------------------
160-
oracle.install.asm.OSOPER={{ oper_group }}
161-
142+
oracle.install.asm.OSOPER={{ asmoper_group }}
143+
#
162144
##-------------------------------------------------------------------------------
163-
# The OSASM_GROUP is the OS group which is to be granted OSASM privileges. This
164-
# must be different than the previous two.
165-
#-------------------------------------------------------------------------------
166-
oracle.install.asm.OSASM={{ dba_group }}
167-
168-
{% endif %}
145+
## The OSASM_GROUP is the OS group which is to be granted OSASM privileges. This
146+
## must be different than the previous two.
147+
##-------------------------------------------------------------------------------
148+
oracle.install.asm.OSASM={{ asmadmin_group }}
169149

170150
################################################################################
171151
# #

‎roles/oraswgi-install/templates/grid-install.rsp.12.1.0.1.j2‎

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,6 @@ ORACLE_HOME={{ oracle_home_gi }}
3535
# The DBA_GROUP is the OS group which is to be granted OSDBA privileges.
3636
#-------------------------------------------------------------------------------
3737

38-
{% if role_separation==True %}
39-
4038
oracle.install.asm.OSDBA={{ asmdba_group }}
4139

4240
##-------------------------------------------------------------------------------
@@ -51,24 +49,6 @@ oracle.install.asm.OSOPER={{ asmoper_group }}
5149
##-------------------------------------------------------------------------------
5250
oracle.install.asm.OSASM={{ asmadmin_group }}
5351

54-
{% else %}
55-
56-
oracle.install.asm.OSDBA={{ dba_group }}
57-
58-
#-------------------------------------------------------------------------------
59-
## The OPER_GROUP is the OS group which is to be granted OSOPER privileges.
60-
## The value to be specified for OSOPER group is optional.
61-
##-------------------------------------------------------------------------------
62-
oracle.install.asm.OSOPER={{ oper_group }}
63-
64-
##-------------------------------------------------------------------------------
65-
# The OSASM_GROUP is the OS group which is to be granted OSASM privileges. This
66-
# must be different than the previous two.
67-
#-------------------------------------------------------------------------------
68-
oracle.install.asm.OSASM={{ dba_group }}
69-
70-
{% endif %}
71-
7252
################################################################################
7353
# #
7454
# SECTION C - SCAN #

‎roles/oraswgi-install/templates/grid-install.rsp.12.1.0.2.j2‎

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,6 @@ ORACLE_HOME={{ oracle_home_gi }}
3535
# The DBA_GROUP is the OS group which is to be granted OSDBA privileges.
3636
#-------------------------------------------------------------------------------
3737

38-
{% if role_separation==True %}
39-
4038
oracle.install.asm.OSDBA={{ asmdba_group }}
4139

4240
##-------------------------------------------------------------------------------
@@ -51,23 +49,6 @@ oracle.install.asm.OSOPER={{ asmoper_group }}
5149
##-------------------------------------------------------------------------------
5250
oracle.install.asm.OSASM={{ asmadmin_group }}
5351

54-
{% else %}
55-
56-
oracle.install.asm.OSDBA={{ dba_group }}
57-
58-
#-------------------------------------------------------------------------------
59-
## The OPER_GROUP is the OS group which is to be granted OSOPER privileges.
60-
## The value to be specified for OSOPER group is optional.
61-
##-------------------------------------------------------------------------------
62-
oracle.install.asm.OSOPER={{ oper_group }}
63-
64-
##-------------------------------------------------------------------------------
65-
# The OSASM_GROUP is the OS group which is to be granted OSASM privileges. This
66-
# must be different than the previous two.
67-
#-------------------------------------------------------------------------------
68-
oracle.install.asm.OSASM={{ dba_group }}
69-
70-
{% endif %}
7152

7253
################################################################################
7354
# #

‎roles/oraswgi-install/templates/grid-install.rsp.12.2.0.1.j2‎

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -92,39 +92,20 @@ ORACLE_BASE={{oracle_base}}
9292
#-------------------------------------------------------------------------------
9393
# The OSDBA_GROUP is the OS group which is to be granted SYSDBA privileges.
9494
#-------------------------------------------------------------------------------
95-
{% if role_separation==True %}
96-
9795
oracle.install.asm.OSDBA={{ asmdba_group }}
9896

9997
##-------------------------------------------------------------------------------
10098
## The OPER_GROUP is the OS group which is to be granted OSOPER privileges.
10199
## The value to be specified for OSOPER group is optional.
102100
##-------------------------------------------------------------------------------
103101
oracle.install.asm.OSOPER={{ asmoper_group }}
104-
#
102+
105103
##-------------------------------------------------------------------------------
106104
## The OSASM_GROUP is the OS group which is to be granted OSASM privileges. This
107105
## must be different than the previous two.
108106
##-------------------------------------------------------------------------------
109107
oracle.install.asm.OSASM={{ asmadmin_group }}
110108

111-
{% else %}
112-
113-
oracle.install.asm.OSDBA={{ dba_group }}
114-
115-
#-------------------------------------------------------------------------------
116-
## The OPER_GROUP is the OS group which is to be granted OSOPER privileges.
117-
## The value to be specified for OSOPER group is optional.
118-
##-------------------------------------------------------------------------------
119-
oracle.install.asm.OSOPER={{ oper_group }}
120-
121-
##-------------------------------------------------------------------------------
122-
# The OSASM_GROUP is the OS group which is to be granted OSASM privileges. This
123-
# must be different than the previous two.
124-
#-------------------------------------------------------------------------------
125-
oracle.install.asm.OSASM={{ dba_group }}
126-
127-
{% endif %}
128109

129110
################################################################################
130111
# #

0 commit comments

Comments
 (0)