Merge pull request #64 from bgraef/main

add olam v1 changes for upgrade lab

Author: bgraef

olam/create_instance.yml

@@ -324,13 +324,11 @@
         - inventory_hostname in groups['control']|default([])
         - use_olae_only
 
-    - name: Install Oracle Linux Automation Manager
-      ansible.builtin.include_tasks: deploy_olam_single.yml
-      vars:
-        control_node_ip: "{{ hostvars[inventory_hostname]['ansible_default_ipv4']['address'] }}"
-      when:
-        - inventory_hostname in groups['control']|default([])
-        - olam_single_host
+- name: Install Oracle Linux Automation Manager
+  vars:
+    control_node_ip: "{{ hostvars[inventory_hostname]['ansible_default_ipv4']['address'] }}"
+    install_type: "{{ olam_type if olam_type is defined else (lookup('file', 'default_vars.yml') | from_yaml).olam_type | default('single') }}"
+  ansible.builtin.import_playbook: "deploy_olam_{{ install_type }}.yml"
 
 - name: Update all rpm packages
   ansible.builtin.import_playbook: update_all_rpms.yml

olam/default_vars.yml

@@ -20,7 +20,7 @@ block_count: 1
 
 update_all: false
 passwordless_ssh: false
-olam_single_host: false
+olam_type: single
 use_olae_only: false
 use_olam_builder: false
 use_olam_pah: false

olam/deploy_olam_none.yml

@@ -0,0 +1,15 @@
+---
+# Copyright (c) 2024 Oracle and/or its affiliates.
+# This software is made available to you under the terms of the Universal Permissive License (UPL), Version 1.0.
+# The Universal Permissive License (UPL), Version 1.0 (see COPYING or https://oss.oracle.com/licenses/upl)
+# See LICENSE.TXT for details.
+
+- name: Run olam noop
+  hosts: control
+  become: true
+
+  tasks:
+
+    - name: Print noop message
+      ansible.builtin.debug:
+        msg: "This is a noop and does not deploy OLAM."