Skip to content

Commit df0df23

Browse files
committed
- Create directories using a list instead of one directory per task (oraswgi-install/oraswdb-install)
Based on 'oracle_directories' list - Added 'creates' element to 'oracle_sw_image_db' list. Used when unpacking .zip files for installation. If the zip-file is already unzipped it will be skipped. Uses the 'last' file when unpacking a zip file
1 parent a89e6de commit df0df23

File tree

5 files changed

+50
-75
lines changed

5 files changed

+50
-75
lines changed

roles/oradb-delete/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: Delete database(s)
4-
shell: "{{ oracle_home_db }}/bin/dbca -deleteDatabase -sourceDB {{ item.oracle_db_name }} -sysDBAUserName sys -sysDBAPassword {{ item.oracle_db_passwd }} -silent"
4+
shell: "{{ oracle_home_db }}/bin/dbca -deleteDatabase -sourceDB {{ item.oracle_db_name }} -sysDBAUserName sys -sysDBAPassword {{dbpasswords[item.oracle_db_name]['sys']}} -silent"
55
with_items: "{{oracle_databases}}"
66
run_once: "{{ configure_cluster}}"
77
when: item.state |upper == 'ABSENT'

roles/oraswdb-install/defaults/main.yml

Lines changed: 21 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,25 @@
3232
oracle_base: /u01/app/oracle
3333
oracle_home_db: "{% if item.0 is defined %}{% if item.0.oracle_home is defined %}{{ item.0.oracle_home}}{% else %}{{ oracle_base }}/{{ item.0.oracle_version_db }}/{{ item.0.home }}{% endif %}{% else %}{% if item.oracle_home is defined %}{{ item.oracle_home }}{% else %}{{ oracle_base }}/{{ item.oracle_version_db }}/{{ item.home }}{% endif %}{% endif %}"
3434

35-
oracle_profile_name: "{% if item.oracle_db_name is defined %}.profile_{{ item.oracle_db_name }}{% else %}.profile_{{ item.home }}{% endif %}" # Name of profile-file. Sets up the environment for that database. One per database
35+
oracle_profile_name: "{% if item.home is defined %}.profile_{{ item.home }}_{{item.oracle_version_db}}{% endif %}" # Name of profile-file. Sets up the environment for that ORACLE_HOME
3636
oracle_hostname: "{{ ansible_fqdn }}" # Full (FQDN) name of the host
3737
oracle_sw_source_www: http://www/orasw # address to all software if using the get_url module when putting software on the host(s)
3838
oracle_sw_source_local: /tmp # Path to all software if using the copy module when putting software on the host(s)
3939
is_sw_source_local: true
4040
configure_cluster: false
4141
autostartup_service: false # automatic startup/stop databases service
4242

43+
oracle_directories:
44+
- {name: "{{ oracle_stage }}", owner: "{{ oracle_user }}", group: "{{ oracle_group }}", mode: 775 }
45+
- {name: "{{ oracle_rsp_stage }}", owner: "{{ oracle_user }}", group: "{{ oracle_group }}", mode: 775 }
46+
- {name: "{{ oracle_base }}", owner: "{{ oracle_user }}", group: "{{ oracle_group }}", mode: 775 }
47+
- {name: "{{ oracle_base }}/cfgtoollogs", owner: "{{ oracle_user }}", group: "{{ oracle_group }}", mode: 775 }
48+
- {name: "{{ oracle_base }}/admin", owner: "{{ oracle_user }}", group: "{{ oracle_group }}", mode: 775 }
49+
- {name: "{{ oracle_base }}/audit", owner: "{{ oracle_user }}", group: "{{ oracle_group }}", mode: 775 }
50+
- {name: "{{ oracle_base }}/cfgtoollogs/dbca", owner: "{{ oracle_user }}", group: "{{ oracle_group }}", mode: 775 }
51+
- {name: "{{ oracle_base }}/cfgtoollogs/sqlpatch", owner: "{{ oracle_user }}", group: "{{ oracle_group }}", mode: 775 }
52+
- {name: "{{ oracle_base }}/cfgtoollogs/netca", owner: "{{ oracle_user }}", group: "{{ oracle_group }}", mode: 775 }
53+
4354
glogin_default_nocdb:
4455
- "set sqlprompt \"_user @ _connect_identifier:>\""
4556
- "set time on"
@@ -56,15 +67,15 @@
5667
- "set time on"
5768

5869
oracle_sw_image_db:
59-
- { filename: linuxx64_12201_database.zip, version: 12.2.0.1 }
60-
- { filename: linuxamd64_12102_database_1of2.zip, version: 12.1.0.2 }
61-
- { filename: linuxamd64_12102_database_2of2.zip, version: 12.1.0.2 }
62-
- { filename: linuxamd64_12c_database_1of2.zip, version: 12.1.0.1 }
63-
- { filename: linuxamd64_12c_database_2of2.zip, version: 12.1.0.1 }
64-
- { filename: p13390677_112040_Linux-x86-64_1of7.zip, version: 11.2.0.4 }
65-
- { filename: p13390677_112040_Linux-x86-64_2of7.zip, version: 11.2.0.4 }
66-
- { filename: p10404530_112030_Linux-x86-64_1of7.zip, version: 11.2.0.3 }
67-
- { filename: p10404530_112030_Linux-x86-64_2of7.zip, version: 11.2.0.3 }
70+
- { filename: linuxx64_12201_database.zip, version: 12.2.0.1, creates: 'database/runInstaller' }
71+
- { filename: linuxamd64_12102_database_1of2.zip, version: 12.1.0.2, creates: 'database/stage/sizes/oracle.server.Custom.sizes.properties' }
72+
- { filename: linuxamd64_12102_database_2of2.zip, version: 12.1.0.2, creates: 'database/install/.oui' }
73+
- { filename: linuxamd64_12c_database_1of2.zip, version: 12.1.0.1, creates: 'database/runInstaller' }
74+
- { filename: linuxamd64_12c_database_2of2.zip, version: 12.1.0.1, creates: 'database/runInstaller' }
75+
- { filename: p13390677_112040_Linux-x86-64_1of7.zip, version: 11.2.0.4, creates: 'database/install/resource/cons_zh_TW.nls' }
76+
- { filename: p13390677_112040_Linux-x86-64_2of7.zip, version: 11.2.0.4, creates: 'database/stage/Components/oracle.rdbms/11.2.0.4.0/1/DataFiles/filegroup18.jar' }
77+
- { filename: p10404530_112030_Linux-x86-64_1of7.zip, version: 11.2.0.3, creates: 'database/readme.html'}
78+
- { filename: p10404530_112030_Linux-x86-64_2of7.zip, version: 11.2.0.3, creates: 'database/stage/Components/oracle.sysman.console.db/11.2.0.3.0/1/DataFiles/filegroup2.jar' }
6879

6980
oracle_databases:
7081
- home: db1

roles/oraswdb-install/tasks/main.yml

Lines changed: 10 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -24,46 +24,18 @@
2424
tags:
2525
- orainst
2626

27-
- name: Create stage directory (base)
28-
file: dest={{ oracle_stage }} mode=775 owner={{ oracle_user }} group={{ oracle_group }} state=directory
27+
- name: Create common directories
28+
file: dest={{ item.name }} mode={{ item.mode}} owner={{ item.owner }} group={{ item.group }} state=directory
29+
with_items: "{{oracle_directories}}"
2930
tags:
3031
- directoriesdb
3132

3233
- name: Create stage directory (version specific)
33-
file: dest={{ oracle_stage }}/{{ item[0].version }} mode=775 owner={{ oracle_user }} group={{ oracle_group }} state=directory
34-
with_nested:
35-
- "{{ oracle_sw_image_db }}"
34+
file: dest={{ oracle_stage }}/{{ item.oracle_version_db }} mode=775 owner={{ oracle_user }} group={{ oracle_group }} state=directory
35+
with_items:
3636
- "{{ oracle_databases }}"
3737
run_once: "{{ configure_cluster}}"
38-
when: item[0].version == item[1].oracle_version_db
39-
tags:
40-
- directoriesdb
41-
42-
- name: Create rsp stage directory
43-
file: dest={{ oracle_rsp_stage }} mode=775 owner={{ oracle_user }} group={{ oracle_group }} state=directory
44-
tags:
45-
- directoriesdb
46-
47-
- name: Create ORACLE_BASE directory
48-
file: dest={{ oracle_base }} mode=775 owner={{ oracle_user }} group={{ oracle_group }} state=directory
49-
tags:
50-
- directoriesdb
51-
52-
- name: Create cfgtoollogs directory
53-
file: dest={{ oracle_base }}/cfgtoollogs mode=775 owner={{ oracle_user }} group={{ oracle_group }} state=directory recurse=yes
54-
become: yes
55-
tags:
56-
- directoriesdb
57-
58-
- name: Create admin directory
59-
file: dest={{ oracle_base }}/admin mode=775 owner={{ oracle_user }} group={{ oracle_group }} state=directory
60-
become: yes
61-
tags:
62-
- directoriesdb
63-
64-
- name: Create audit directory
65-
file: dest={{ oracle_base }}/audit mode=775 owner={{ oracle_user }} group={{ oracle_group }} state=directory
66-
become: yes
38+
when: oracle_databases is defined
6739
tags:
6840
- directoriesdb
6941

@@ -98,7 +70,7 @@
9870
- oradbsw
9971

10072
- name: Extract files to stage-area
101-
unarchive: src={{ oracle_stage }}/{{ item[0].filename }} dest={{ oracle_stage }}/{{ item[0].version }} copy=no
73+
unarchive: src={{ oracle_stage }}/{{ item[0].filename }} dest={{ oracle_stage }}/{{ item[0].version }} copy=no creates="{{ oracle_stage }}/{{ item[0].version }}/{{ item[0].creates}}"
10274
with_nested:
10375
- "{{oracle_sw_image_db}}"
10476
- "{{oracle_databases}}"
@@ -110,14 +82,16 @@
11082
- oradbswunpack
11183

11284
- name: Extract files to stage-area (from remote location)
113-
unarchive: src={{ oracle_stage_remote }}/{{ item[0].filename }} dest={{ oracle_stage }}/{{ item[0].version }} copy=no
85+
unarchive: src={{ oracle_stage_remote }}/{{ item[0].filename }} dest={{ oracle_stage }}/{{ item[0].version }} copy=no creates="{{ oracle_stage }}/{{ item[0].version }}/{{ item[0].creates}}"
11486
with_nested:
11587
- "{{oracle_sw_image_db}}"
11688
- "{{oracle_databases}}"
11789
become: yes
11890
become_user: "{{ oracle_user }}"
11991
run_once: "{{ configure_cluster}}"
12092
when: item[0].version == item[1].oracle_version_db and not oracle_sw_copy and oracle_sw_unpack
93+
# args:
94+
# creates: "{{ oracle_stage }}/{{ item[0].version }}/database/runInstaller"
12195
tags:
12296
- oradbswunpack
12397

roles/oraswgi-install/defaults/main.yml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,20 @@
3535
oracle_base: /u01/app/oracle
3636
oracle_rsp_stage: "{{ oracle_stage }}/rsp"
3737
oracle_inventory_loc: /u01/app/oraInventory
38+
39+
oracle_directories:
40+
- {name: "{{ oracle_stage }}", owner: "{{ oracle_user }}", group: "{{ oracle_group }}", mode: 775 }
41+
- {name: "{{ oracle_rsp_stage }}", owner: "{{ oracle_user }}", group: "{{ oracle_group }}", mode: 775 }
42+
- {name: "{{ oracle_base }}", owner: "{{ oracle_user }}", group: "{{ oracle_group }}", mode: 775 }
43+
- {name: "{{ oracle_inventory_loc}}", owner: "{{ grid_install_user }}", group: "{{ oracle_group }}", mode: 775 }
44+
- {name: "{{ oracle_base }}/cfgtoollogs", owner: "{{ oracle_user }}", group: "{{ oracle_group }}", mode: 775 }
45+
- {name: "{{ oracle_base }}/admin", owner: "{{ oracle_user }}", group: "{{ oracle_group }}", mode: 775 }
46+
- {name: "{{ oracle_base }}/audit", owner: "{{ oracle_user }}", group: "{{ oracle_group }}", mode: 775 }
47+
- {name: "{{ oracle_base }}/cfgtoollogs/dbca", owner: "{{ oracle_user }}", group: "{{ oracle_group }}", mode: 775 }
48+
- {name: "{{ oracle_base }}/cfgtoollogs/sqlpatch", owner: "{{ oracle_user }}", group: "{{ oracle_group }}", mode: 775 }
49+
- {name: "{{ oracle_base }}/cfgtoollogs/netca", owner: "{{ oracle_user }}", group: "{{ oracle_group }}", mode: 775 }
50+
51+
3852
oracle_home_gi: "{% if configure_cluster %}{{ oracle_home_gi_cl }}{% else %}{{ oracle_home_gi_so }}{% endif %}"
3953
oracle_home_gi_cl: "/u01/app/{{ oracle_install_version_gi }}/grid" # ORACLE_HOME for Grid Infrastructure (Clustered)
4054
oracle_home_gi_so: "{{ oracle_base }}/{{ oracle_install_version_gi }}/grid" # ORACLE_HOME for Grid Infrastructure (Stand Alone)

roles/oraswgi-install/tasks/main.yml

Lines changed: 4 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,12 @@
1717
tags:
1818
- dotprofilegi
1919

20-
- name: Create stage directory (base)
21-
file: dest={{ oracle_stage }} mode=775 owner={{ oracle_user }} group={{ oracle_group }} state=directory
20+
- name: Create common directories
21+
file: dest={{ item.name }} mode={{ item.mode}} owner={{ item.owner }} group={{ item.group }} state=directory
22+
with_items: "{{oracle_directories}}"
2223
tags:
2324
- directories
24-
25+
2526
- name: Create stage directory (version specific)
2627
file: dest={{ oracle_stage }}/{{ item.version }} mode=775 owner="{{ oracle_user }}" group={{ oracle_group }} state=directory
2728
become: yes
@@ -30,31 +31,6 @@
3031
tags:
3132
- directories
3233

33-
- name: Create rsp stage directory
34-
file: dest={{ oracle_rsp_stage }} mode=775 owner="{{ oracle_user }}" group={{ oracle_group }} state=directory
35-
tags:
36-
- directories
37-
38-
- name: Create ORACLE_INVENTORY directory
39-
file: dest={{ oracle_inventory_loc }} owner={{ grid_install_user }} group={{ oracle_group }} mode=775 state=directory
40-
tags:
41-
- directories
42-
43-
- name: Create ORACLE_BASE directory
44-
file: dest={{ oracle_base }} mode=775 owner={{ oracle_user }} group={{ oracle_group }} state=directory
45-
tags:
46-
- directories
47-
48-
- name: Create admin directory
49-
file: dest={{ oracle_base }}/admin mode=775 owner={{ oracle_user }} group={{ oracle_group }} state=directory
50-
tags:
51-
- directories
52-
53-
- name: Create cfgtoollogs directory
54-
file: dest={{ oracle_base }}/cfgtoollogs mode=775 owner={{ oracle_user }} group={{ oracle_group }} state=directory
55-
tags:
56-
- directories
57-
5834
- name: Create ORACLE_HOME directory (GI)
5935
file: dest={{ oracle_home_gi }} owner="{{ grid_install_user }}" group={{ oracle_group }} state=directory mode=775
6036
become: yes

0 commit comments

Comments
 (0)