Skip to content

Commit dbf301b

Browse files
oravirtoravirt
committed
Spelling error fix
1 parent 0c9d447 commit dbf301b

File tree

14 files changed

+144
-30
lines changed

14 files changed

+144
-30
lines changed

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ This will configure the host specific Oracle stuff:
4848
<b>orahost-storage:</b>
4949
This role configures storage that shoud be used by ASM.
5050
- Partitions devices (using parted)
51-
- Create ASMlib labels or sets up udev-rules for device name persistency
51+
- Create ASMlib labels or sets up udev-rules for device name persistence
5252

5353
<b>oraswgi-install:</b>
5454
This role will install and configure Oracle Grid Infrastructure. Tested with 12.1.0.1/12.1.0.2 & 11.2.0.4
@@ -116,7 +116,7 @@ This role will take a previously installed/patched Oracle Database Server instal
116116
<b>Changelog (bigger changes)</b>
117117

118118
2014-10-19
119-
- Added support for udev device name persistency
119+
- Added support for udev device name persistence
120120

121121
2014-10-10
122122
- Added 'oracle_gi_nic_pub|priv' and removed hardcoded nic's in grid-install template. Now possible to define which interface does what

‎group_vars/orarac-dc2‎

Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
1+
---
2+
hostgroup: orarac-dc2
3+
role_separation: false
4+
device_persistence: udev
5+
6+
configure_interconnect: true
7+
configure_ssh: true
8+
configure_host_disks: true
9+
10+
configure_cluster: true
11+
12+
################ Grid Infrastructure specifics ################
13+
oracle_install_option_gi: CRS_CONFIG
14+
oracle_install_version_gi: 12.1.0.2
15+
16+
oracle_password: Oracle123
17+
oracle_scan: orarac-scan-dc2.discworld.net
18+
oracle_vip: -vip
19+
oracle_scan_port: 1521
20+
oracle_asm_init_dg: crs
21+
22+
23+
24+
oracle_sw_image_db:
25+
- { filename: linuxamd64_12102_database_1of2.zip, version: 12.1.0.2, download: false }
26+
- { filename: linuxamd64_12102_database_2of2.zip, version: 12.1.0.2, download: false }
27+
# - { filename: linuxamd64_12c_database_1of2.zip, version: 12.1.0.1, download: false }
28+
# - { filename: linuxamd64_12c_database_2of2.zip, version: 12.1.0.1, download: false }
29+
# - { filename: p13390677_112040_Linux-x86-64_1of7.zip, version: 11.2.0.4, download: true }
30+
# - { filename: p13390677_112040_Linux-x86-64_2of7.zip, version: 11.2.0.4, download: true }
31+
32+
oracle_databases:
33+
racdb:
34+
oracle_version_db: 12.1.0.1
35+
oracle_edition: EE
36+
oracle_db_name: racdb
37+
oracle_db_passwd: Oracle123
38+
oracle_db_type: RAC
39+
is_container: "false"
40+
pdb_prefix: racpdb
41+
num_pdbs: 2
42+
is_racone: "false"
43+
storage_type: ASM
44+
service_name: racdb_serv
45+
oracle_init_params: "open_cursors=300,processes=700"
46+
oracle_db_mem_percent: 20
47+
oracle_database_type: MULTIPURPOSE
48+
redolog_size_in_mb: 100
49+
delete_db: false
50+
51+
52+
oracle_dbf_dir_asm: "DATA"
53+
oracle_reco_dir_asm: "FRA"
54+
55+
host_fs_layout:
56+
u01:
57+
{mntp: /u01, device: /dev/sdb, vgname: vgora, pvname: /dev/sdb1, lvname: lvora}
58+
59+
asm_diskgroups:
60+
- crs
61+
- data
62+
- fra
63+
64+
asm_storage_layout:
65+
crs:
66+
- {device: /dev/sdc, asmlabel: crs01}
67+
data:
68+
- {device: /dev/sdd, asmlabel: data01}
69+
- {device: /dev/sde, asmlabel: data02}
70+
fra:
71+
- {device: /dev/sdf, asmlabel: fra01}
72+
- {device: /dev/sdg, asmlabel: fra02}
73+
- {device: /dev/sdh, asmlabel: fra03}
74+

‎oraasm-createdg/templates/asmca-createdg.sh.j2‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33

44
{{ oracle_home_gi }}/bin/asmca -silent -createDiskGroup \
55
-diskGroupName {{ item }} \
6-
{% if device_persistency == 'udev' %}
6+
{% if device_persistence == 'udev' %}
77
{% for disk in asm_storage_layout[item] %}
88
-disk '{{ oracle_asm_disk_string }}{{ disk.asmlabel }}' \
99
{% endfor %}
10-
{% elif device_persistency == 'asmlib' %}
10+
{% elif device_persistence == 'asmlib' %}
1111
{% for disk in asm_storage_layout[item] %}
1212
-disk 'ORCL:{{ disk.asmlabel|upper }}' \
1313
{% endfor %}

‎orahost-storage/defaults/main.yml‎

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

3-
device_persistency: asmlib
4-
oracle_asm_disk_string: "{% if device_persistency == 'asmlib' %}{% elif device_persistency == 'udev' %}/dev/oracle/{% else %}{% endif %}"
3+
device_persistence: asmlib
4+
oracle_asm_disk_string: "{% if device_persistence == 'asmlib' %}{% elif device_persistence == 'udev' %}/dev/oracle/{% else %}{% endif %}"
55

66
# asm_diskgroups: # ASM Diskgroups used for DB-storage. Should map to dict asm_storage_layout.
77
# - crs

‎orahost-storage/tasks/main.yml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -22,65 +22,65 @@
2222
- name: ASMlib | Build script to create asmlib-labels
2323
template: src=label-asm-disks.sh.j2 dest={{ oracle_rsp_stage }}/label-asm-disks-{{ item }}.sh owner={{ oracle_user }} group={{ oracle_group }} mode=775
2424
with_items: asm_diskgroups
25-
when: master_node and device_persistency == 'asmlib'
25+
when: master_node and device_persistence == 'asmlib'
2626
tags: asmlib
2727

2828
- name: ASMlib | Run script to create asmlib-labels
2929
shell: sh {{ oracle_rsp_stage }}/label-asm-disks-{{ item }}.sh
3030
with_items: asm_diskgroups
31-
when: master_node and device_persistency == 'asmlib'
31+
when: master_node and device_persistence == 'asmlib'
3232
tags: asmlib
3333

3434
- name: ASMlib | Rescan ASM disks
3535
shell: service oracleasm scandisks
36-
when: device_persistency == 'asmlib'
36+
when: device_persistence == 'asmlib'
3737
tags: asmlib
3838

3939
- name: ASMlib | List ASM disks
4040
shell: service oracleasm listdisks
41-
when: device_persistency == 'asmlib'
41+
when: device_persistence == 'asmlib'
4242
register: listdisks
4343
tags: asmlib
4444

4545
- name: List ASM disks
4646
debug: var=listdisks.stdout_lines
47-
when: device_persistency == 'asmlib'
47+
when: device_persistence == 'asmlib'
4848
tags: asmlib
4949

5050
- name: udev | Create device to label mappings for udev
5151
template: src=udev-label-device-mapping.txt.j2 dest={{ oracle_stage }}/udev/udev-{{ item }}
5252
with_items: asm_diskgroups
53-
when: device_persistency == 'udev'
53+
when: device_persistence == 'udev'
5454
tags: udev
5555

5656
- name: udev | Assemble into one mapfile
5757
assemble: src={{ oracle_stage }}/udev dest={{ oracle_rsp_stage }}/udev-device-input.txt
58-
when: device_persistency == 'udev'
58+
when: device_persistence == 'udev'
5959
tags: udev
6060

6161
- name: udev | Create script to create rules
6262
template: src=setup-udev.sh.j2 dest={{ oracle_rsp_stage }}/setup-udev-rules.sh mode=755
63-
when: device_persistency == 'udev'
63+
when: device_persistence == 'udev'
6464
tags: udev
6565

6666
- name: udev | Run script to create udev rules
6767
shell: "{{ oracle_rsp_stage }}/setup-udev-rules.sh"
68-
when: device_persistency == 'udev'
68+
when: device_persistence == 'udev'
6969
tags: udev
7070

7171
- name: udev | Reload rules
7272
shell: partprobe; start_udev
73-
when: device_persistency == 'udev'
73+
when: device_persistence == 'udev'
7474
tags: udev
7575

7676
- name: udev | List device aliases (register)
7777
shell: ls -l {{ oracle_asm_disk_string }}
78-
when: device_persistency == 'udev'
78+
when: device_persistence == 'udev'
7979
tags: udev
8080
register: lsdevice
8181

8282
- name: List device aliases
8383
debug: var=lsdevice.stdout_lines
84-
when: device_persistency == 'udev'
84+
when: device_persistence == 'udev'
8585
tags: udev
8686

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{% 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"
3+
{% endfor %}

‎orahost-storage/templates/setup-udev.sh.j2‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
#!/bin/bash
2+
TEMPFILE=/tmp/udev-temp-file
3+
UDEVRULE=/etc/udev/rules.d/99-asm-devices.rules
4+
5+
if [[ -f $TEMPFILE ]]; then
6+
rm -f $TEMPFILE
7+
fi
8+
9+
while read -r device label owner group
10+
do
11+
12+
if [[ ${device} == /dev/sda ]]; then
13+
echo "Trying to use root disk. Exiting"
14+
continue
15+
fi
16+
17+
scsiid=`scsi_id -g -u -d $device`
18+
chkexist=`grep $scsiid $UDEVRULE |wc -l`
19+
if [[ $chkexist == 1 ]]; then
20+
echo "Error: $scsiid is already present. Exiting"
21+
continue
22+
fi
23+
echo "KERNEL==\"sd?1\", BUS==\"scsi\", PROGRAM==\"/sbin/scsi_id -g -u -d /dev/\$parent\", RESULT==\"$scsiid\", NAME=\"$label\", OWNER=\"$owner\", GROUP=\"$group\", MODE=\"0660\"" >> $TEMPFILE
24+
25+
done < {{ oracle_rsp_stage }}/udev-device-input.txt
26+
27+
if [[ -f $TEMPFILE ]]; then
28+
cp -f $TEMPFILE $UDEVRULE
29+
exit 0
30+
else
31+
exit 0
32+
fi
33+

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{% 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 %}
3+
4+
{% endfor %}

‎orahost/defaults/main.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
configure_cluster: false
5454
oracle_stage: /u01/stage
5555
oracle_rsp_stage: "{{ oracle_stage }}/rsp"
56-
device_persistency: asmlib
56+
device_persistence: asmlib
5757

5858

5959
host_fs_layout: # Sets up filesystem on host. If storage_type=FS under oracle_databases, this is where the mapping between device/fs is described

‎orahost/tasks/main.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -213,19 +213,19 @@
213213

214214
- name: Asmlib | Configure Oracle Asmlib
215215
template: src=oracleasm.j2 dest=/etc/sysconfig/oracleasm owner=root mode=0777 force=yes
216-
when: device_persistency == 'asmlib'
216+
when: device_persistence == 'asmlib'
217217
tags:
218218
- asmlibconfig
219219

220220
- name: Asmlib | Enable and start Oracle Asmlib
221221
service: name=oracleasm state=started enabled=yes
222-
when: device_persistency == 'asmlib'
222+
when: device_persistence == 'asmlib'
223223
tags:
224224
- asmlibconfig
225225

226226
- name: Asmlib | Restart Asmlib
227227
service: name=oracleasm state=restarted
228-
when: device_persistency == 'asmlib'
228+
when: device_persistence == 'asmlib'
229229
tags:
230230
- asmlibconfig
231231

0 commit comments

Comments
 (0)