Skip to content

Commit d3743bb

Browse files
committed
oraswgi_install: documentation changes for ansible-doctor make happy again
1 parent 40c8594 commit d3743bb

File tree

4 files changed

+92
-14
lines changed

4 files changed

+92
-14
lines changed
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
---
2+
bugfixes:
3+
- "oraswgi_install: documentation changes for ansible-doctor make happy again (oravirt#474)"

doc/guides/restart_rac.adoc

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
:toc:
2+
:toc-placement!:
3+
:toclevels: 4
4+
toc::[]
5+
6+
:sectnums:
7+
:sectnumlevels: 4
8+
9+
== Setup ASM for Oracle Grid Infrastructure / Restart
10+
11+
.Inventory Variables for ASM
12+
[options="header,footer"]
13+
|=======================
14+
|Value |Default |Description
15+
|`device_persistence`
16+
|empty string
17+
| Allowed values: `asmfd`, `asmlib`
18+
|`oracle_asm_disk_string`
19+
|`ORCL:*`
20+
| init.ora-Parameter for `asm_diskstring`.
21+
|`oracle_asm_init_dg`
22+
|`crs`
23+
| 1st Diskgroup for ASM SPFile.
24+
|`asm_diskgroups`
25+
|
26+
| Defines the ASM-Diskgroups. More Details below.
27+
|=======================
28+
29+
.Example `asm_diskgroups`
30+
----
31+
asm_diskgroups: # ASM Diskgroups used for DB-storage. Should map to dict asm_storage_layout.
32+
- diskgroup: data
33+
state: present
34+
properties:
35+
- {redundancy: external, ausize: 4}
36+
attributes:
37+
- {name: compatible.rdbms, value: 11.2.0.4.0}
38+
- {name: compatible.asm, value: "19.0.0.0.0"}
39+
disk:
40+
- {device: /dev/sdc, asmlabel: data01}
41+
----
42+
43+
== Setup Real Application Clusters (RAC)
44+
45+
IMPORTANT: The documentation is heavily work in progress.
46+
47+
=== Inventory Variables
48+
49+
.Inventory Variables for Cluster configuration
50+
[options="header,footer"]
51+
|=======================
52+
|Value |Default |Description
53+
|`oracle_install_option_gi`
54+
|empty string
55+
| Allowed values: `CRS_CONFIG`, `HA_CONFIG`
56+
| `oracle_node_vip`
57+
| {{ ansible_hostname }}{{ oracle_vip }}
58+
| Defines the VIP of the clusternode.
59+
| `oracle_vip`
60+
| `-vip`
61+
| Suffix for VIP when `oracle_node_vip` is not defined.
62+
|=======================
63+

roles/oraswgi_install/README.md

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -99,8 +99,7 @@ gi_ignoreprereq: false
9999
100100
### oracle_asm_init_dg
101101
102-
Do not use - is replaced in the future!
103-
Reason why RAC support has been disabled...
102+
1st Diskgroup where ASM SPFile is placed.
104103
105104
#### Default value
106105
@@ -190,8 +189,11 @@ oracle_gi_nic_pub: eth0
190189

191190
### oracle_ic_net
192191

193-
Do not use - is replaced in the future!
194-
Reason why RAC support has been disabled...
192+
Defines the network for the interconnect.
193+
194+
Important!
195+
196+
Only used, when `configure_interconnect=true` and `ansible_os_family='RedHat'` during cluster installations.
195197

196198
#### Default value
197199

@@ -231,7 +233,13 @@ oracle_sw_image_gi:
231233

232234
suffix added to hostnames for VIPs.
233235

234-
hostnamea{{ oracle_vip }}
236+
{{ ansible_hostname }}{{ oracle_vip }}
237+
238+
Important!
239+
240+
`oracle_node_vip` defines a fixed hostname for the VIP.
241+
242+
That replaces the logic from `oracle_vip` for the VIP!
235243

236244
#### Default value
237245

@@ -293,8 +301,6 @@ run_configtoolallcommand: true
293301

294302
## Open Tasks
295303

296-
- (bug): oracle_vip is not flexible enough.
297-
- (bug): oracle_ic_net will be removed in the future
298304
- (bug): ConfigTools should not depend on olr.loc...
299305
- (bug): ConfigTools should not depend on olr.loc...
300306
- (information): add selectattr to asm_diskgroups

roles/oraswgi_install/defaults/main.yml

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,16 @@ default_dbpass: "{% if item.0.oracle_db_passwd is defined %}{{ item.0.oracle_db_
2323
# @end
2424
# oracle_scan:
2525

26-
# @todo bug: oracle_vip is not flexible enough.
2726
# @var oracle_vip:description: >
2827
# suffix added to hostnames for VIPs.
2928
#
30-
# hostnamea{{ oracle_vip }}
29+
# {{ ansible_hostname }}{{ oracle_vip }}
30+
#
31+
# Important!
32+
#
33+
# `oracle_node_vip` defines a fixed hostname for the VIP.
34+
#
35+
# That replaces the logic from `oracle_vip` for the VIP!
3136
# @end
3237
oracle_vip: -vip
3338

@@ -36,16 +41,17 @@ oracle_vip: -vip
3641
# @end
3742
oracle_scan_port: 1521
3843

39-
# @todo bug: oracle_ic_net will be removed in the future
4044
# @var oracle_ic_net:description: >
41-
# Do not use - is replaced in the future!
42-
# Reason why RAC support has been disabled...
45+
# Defines the network for the interconnect.
46+
#
47+
# Important!
48+
#
49+
# Only used, when `configure_interconnect=true` and `ansible_os_family='RedHat'` during cluster installations.
4350
# @end
4451
oracle_ic_net: 3.3.3.{{ ansible_all_ipv4_addresses[0].split(".")[-1] }}
4552

4653
# @var oracle_asm_init_dg:description: >
47-
# Do not use - is replaced in the future!
48-
# Reason why RAC support has been disabled...
54+
# 1st Diskgroup where ASM SPFile is placed.
4955
# @end
5056
oracle_asm_init_dg: crs
5157

0 commit comments

Comments
 (0)