Merge pull request #79 from bgraef/main

merge fixes for olam on ol9

Author: bgraef

olam/block.yml

@@ -10,6 +10,8 @@
   block:
     - name: Create block volume
       oracle.oci.oci_blockstorage_volume:
+        config_file_location: "{{ oci_config_file | default(omit) }}"
+        config_profile_name: "{{ oci_config_section | default(omit) }}"
         compartment_id: "{{ my_compartment_id }}"
         availability_domain: "{{ my_availability_domain }}"
         display_name: "blockvolume-{{ item.value.instance_name | default('instance-'~timestamp) }}"
@@ -27,7 +29,9 @@
 
     - name: Attach the block volume
       oracle.oci.oci_compute_volume_attachment:
-        instance_id: "{{ instance_id }}"
+        config_file_location: "{{ oci_config_file | default(omit) }}"
+        config_profile_name: "{{ oci_config_section | default(omit) }}"
+        instance_id: "{{ my_instance_id }}"
         type: paravirtualized
         volume_id: "{{ volume_id }}"
         compartment_id: "{{ my_compartment_id }}"

olam/build.yml

@@ -1,11 +1,13 @@
 ---
-# Copyright (c) 2024 Oracle and/or its affiliates.
+# Copyright (c) 2024 2025 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: Launch an instance
   oracle.oci.oci_compute_instance:
+    config_file_location: "{{ oci_config_file | default(omit) }}"
+    config_profile_name: "{{ oci_config_section | default(omit) }}"
     availability_domain: "{{ my_availability_domain }}"
     compartment_id: "{{ my_compartment_id }}"
     display_name: "{{ item.value.instance_name | default('instance-'~timestamp) }}"
@@ -50,23 +52,33 @@
 
 - name: Set the compute instance id
   ansible.builtin.set_fact:
-    instance_id: "{{ result.instance.id }}"
+    my_instance_id: "{{ result.instance.id }}"
+
+- name: Add instance id to state file
+  ansible.builtin.lineinfile:
+    path: .ansible-state
+    line: "instance{{ ansible_loop.index0 + 1 }}_ocid: {{ my_instance_id }}"
+    mode: "0755"
 
 - name: Set the compute instance display_name
   ansible.builtin.set_fact:
-    instance_display_name: "{{ result.instance.display_name }}"
+    my_instance_display_name: "{{ result.instance.display_name }}"
 
 - name: Get the vnic attachment details of instance
   oracle.oci.oci_compute_vnic_attachment_facts:
+    config_file_location: "{{ oci_config_file | default(omit) }}"
+    config_profile_name: "{{ oci_config_section | default(omit) }}"
     compartment_id: "{{ my_compartment_id }}"
-    instance_id: "{{ instance_id }}"
+    instance_id: "{{ my_instance_id }}"
   register: result
   retries: 10
   delay: 30
   until: result is not failed
 
 - name: Get vnic details
   oracle.oci.oci_network_vnic_facts:
+    config_file_location: "{{ oci_config_file | default(omit) }}"
+    config_profile_name: "{{ oci_config_section | default(omit) }}"
     id: "{{ result.vnic_attachments[0].vnic_id }}"
   register: result
   retries: 10
@@ -86,6 +98,7 @@
   loop: "{{ query('sequence', 'start=1 end=' + (block_count) | string) }}"
   loop_control:
     extended: true
+    loop_var: blk_item
   vars:
     block_devices:
       - b
@@ -97,36 +110,36 @@
 - name: Print the public and private ip of the newly created instance
   ansible.builtin.debug:
     msg:
-      - "Instance name: {{ instance_display_name }}"
+      - "Instance name: {{ my_instance_display_name }}"
       - "  public ip: {{ instance_public_ip }}"
       - "  private ip: {{ instance_private_ip }}"
   when: debug_enabled
 
 - name: Add host to in-memory host file
   ansible.builtin.add_host:
-    name: "{{ instance_display_name }}"
+    name: "{{ my_instance_display_name }}"
     groups: "{{ item.value.type }}"
     ansible_user: opc
     ansible_private_key_file: "{{ lookup('env', 'HOME') + '/.ssh/' + private_key }}"
     ansible_ssh_common_args: "-o StrictHostKeyChecking=no"
     ansible_host: "{{ instance_public_ip }}"
     ansible_port: 22
-    instance_ocid: "{{ instance_id }}"
+    instance_ocid: "{{ my_instance_id }}"
 
 - name: Create host ini file
   ansible.builtin.lineinfile:
     path: hosts
-    regexp: '^\[{{ host_group }}'
-    line: "[{{ host_group }}]"
+    regexp: '^\[{{ item.value.type }}'
+    line: "[{{ item.value.type }}]"
     create: true
     mode: "0664"
   delegate_to: localhost
-  loop:
-    - control
-    - execution
-    - db
-  loop_control:
-    loop_var: host_group
+  # loop:
+  #   - control
+  #   - execution
+  #   - db
+  # loop_control:
+  #   loop_var: host_group
 
 - name: Add host to ini host file
   ansible.builtin.lineinfile:
@@ -143,7 +156,7 @@
     mode: "664"
   delegate_to: localhost
   vars:
-    instance_name: "{{ instance_display_name }}"
+    instance_name: "{{ my_instance_display_name }}"
     instance_ansible_user: opc
     instance_ansible_private_key_file: "{{ lookup('env', 'HOME') + '/.ssh/' + private_key }}"
     instance_ansible_ssh_common_args: "-o StrictHostKeyChecking=no"

olam/check_instance_available.yml

@@ -0,0 +1,43 @@
+---
+# Copyright (c) 2024 2025 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: Configure new instances
+  hosts: all:!localhost
+  gather_facts: false
+  vars_files:
+    - default_vars.yml
+    - oci_vars.yml
+
+  tasks:
+
+    - name: Wait for systems to become reachable and usable
+      ansible.builtin.wait_for_connection:
+
+    # - name: Wait for systems to become reachable using ssh
+    #   ansible.builtin.wait_for:
+    #     port: 22
+    #     host: '{{ (ansible_ssh_host | default(ansible_host)) | default(inventory_hostname) }}'
+    #     search_regex: OpenSSH
+    #     delay: 10
+    #     timeout: 300
+
+    - name: Get a set of all available facts
+      ansible.builtin.setup:
+
+    - name: Print in-memory inventory # noqa: run-once[task]
+      ansible.builtin.debug:
+        msg: "{{ groups['all'] }}"
+      delegate_to: localhost
+      run_once: true
+      when: debug_enabled
+
+    - name: Print all variables/facts known for a host # noqa: run-once[task]
+      ansible.builtin.debug:
+        msg: "{{ hostvars[item] }}"
+      loop: "{{ groups['all'] | flatten(levels=1) }}"
+      delegate_to: localhost
+      run_once: true
+      when: debug_enabled

olam/configure_passwordless_ssh.yml

@@ -0,0 +1,85 @@
+---
+# 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: Configure passwordless ssh between hosts
+  hosts: all:!localhost:!remote
+  vars_files:
+    - default_vars.yml
+    - oci_vars.yml
+
+  tasks:
+
+    - name: Generate ssh keypair for user
+      community.crypto.openssh_keypair:
+        path: ~/.ssh/id_rsa
+        size: 2048
+        comment: ol ssh keypair
+      become: true
+      become_user: "{{ username }}"
+
+    - name: Fetch public key file
+      ansible.builtin.fetch:
+        src: "~/.ssh/id_rsa.pub"
+        dest: "buffer/{{ inventory_hostname }}-id_rsa.pub"
+        flat: true
+      become: true
+      become_user: "{{ username }}"
+
+    - name: Copy public key to each destination
+      ansible.posix.authorized_key:
+        user: "{{ username }}"
+        state: present
+        key: "{{ lookup('file', 'buffer/{{ item }}-id_rsa.pub') }}"
+      # loop: "{{ groups['all'] | flatten(levels=1) }}"
+      loop: "{{ ansible_play_hosts_all | difference(['localhost']) }}"
+      become: true
+
+    # - name: Copy public key to each destination for root
+    #   ansible.posix.authorized_key:
+    #     user: "root"
+    #     state: present
+    #     key: "{{ lookup('file', 'buffer/{{ item }}-id_rsa.pub') }}"
+    #   loop: "{{ groups['all'] | flatten(levels=1) }}"
+    #   become: true
+
+    - name: Print hostvars for groups
+      ansible.builtin.debug:
+        msg: "{{ hostvars[item] }}"
+      # loop: "{{ groups['all'] | flatten(levels=1) }}"
+      loop: "{{ ansible_play_hosts_all | difference(['localhost']) }}"
+      when: debug_enabled
+
+    - name: Print vcn subnet_domain_name
+      ansible.builtin.debug:
+        var: my_subnet1_domain_name
+      when: debug_enabled
+
+    - name: Accept new ssh fingerprints
+      ansible.builtin.shell: |
+        ssh-keyscan -t ecdsa-sha2-nistp256 \
+        {{ hostvars[item].ansible_hostname }},\
+        {{ hostvars[item].ansible_default_ipv4.address }},\
+        {{ hostvars[item].ansible_hostname + '.' + my_subnet_domain_name }} >> ~/.ssh/known_hosts
+      with_items:
+        # - "{{ groups['all'] }}"
+        "{{ ansible_play_hosts_all | difference(['localhost']) }}"
+      become: true
+      become_user: "{{ username }}"
+      register: result
+      changed_when: result.rc == 0
+
+    # - name: Accept new ssh fingerprints for root
+    #   ansible.builtin.shell: |
+    #     ssh-keyscan -t ecdsa-sha2-nistp256 \
+    #     {{ hostvars[item].ansible_hostname }},\
+    #     {{ hostvars[item].ansible_default_ipv4.address }},\
+    #     {{ hostvars[item].ansible_hostname + '.' + my_subnet1_domain_name }} >> ~/.ssh/known_hosts
+    #   with_items:
+    #     - "{{ groups['all'] }}"
+    #   become: true
+    #   become_user: "root"
+    #   register: result
+    #   changed_when: result.rc == 0

olam/convert_ansible_inventory.sh

@@ -27,7 +27,7 @@ echo ""
 
 echo "[control:vars]"
 echo "node_type=control"
-echo "peers=local_execution_group"
+# echo "peers=local_execution_group"
 echo ""
 
 echo "[execution]"
@@ -40,6 +40,7 @@ echo ""
 
 echo "[local_execution_group:vars]"
 echo "node_type=execution"
+echo "peers=control"
 echo ""
 
 echo "[hop]"