Misc

oravirt · Nov 20, 2014 · 946e13a · 946e13a
1 parent ea13b83
commit 946e13a
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 32 deletions.
diff --git a/oraasm-createdg/tasks/main.yml b/oraasm-createdg/tasks/main.yml
@@ -35,7 +35,7 @@
     with_items: asm_diskgroups
     sudo: yes
     sudo_user: "{{ grid_user }}"
-    when: master_node and oracle_install_version_gi != "11.2.0.4"
+    when: master_node and oracle_install_version_gi != "11.2.0.4" 
     tags: srvctlasm
     register: srvctlasm
 

diff --git a/oradb-delete/defaults/main.yml b/oradb-delete/defaults/main.yml
@@ -1,7 +1,7 @@
 ---
 
-  oracle_home_db: "{{ oracle_base }}/{{ item.value.oracle_version_db }}/{{ item.key }}"      # ORACLE_HOME path
-  oracle_home_db_install: "{{ oracle_base }}/{{ item.0.oracle_version_db }}/{{ item.0 }}" # This is only used when installing the db server and creating the databases
+  oracle_home_db: "{{ oracle_base }}/{{ item.oracle_version_db }}/{{ item.home }}"      # ORACLE_HOME path
+  oracle_home_db_install: "{{ oracle_base }}/{{ item.oracle_version_db }}/{{ item.home }}" # This is only used when installing the db server and creating the databases
   oracle_stage: /u01/stage
   oracle_rsp_stage: "{{ oracle_stage }}/rsp"
   oracle_inventory_loc: /u01/app/oraInventory

diff --git a/oradb-delete/tasks/main.yml b/oradb-delete/tasks/main.yml
@@ -1,9 +1,9 @@
 ---
 
   - name: Delete database(s)
-    shell: "{{ oracle_home_db }}/bin/dbca -deleteDatabase -sourceDB {{ item.value.oracle_db_name }} -sysDBAUserName sys -sysDBAPassword {{ item.value.oracle_db_passwd }} -silent"
-    with_dict: oracle_databases
-    when: master_node and {{ item.value.delete_db }} 
+    shell: "{{ oracle_home_db }}/bin/dbca -deleteDatabase -sourceDB {{ item.oracle_db_name }} -sysDBAUserName sys -sysDBAPassword {{ item.oracle_db_passwd }} -silent"
+    with_items: oracle_databases
+    when: master_node and {{ item.delete_db }} 
     tags:
       - oradbdelete
     register: oradbdelete

diff --git a/orahost-storage/tasks/main.yml.orig b/orahost-storage/tasks/main.yml.orig