Merge pull request #26 from oracle-quickstart/2.10.2.1

2.10.2.1

Author: arnaudfroidmont

README.md

@@ -350,7 +350,7 @@ validate -g y -cn <cluster name file> --> This will run the GPU throttle check.
 
 validate -g <gpu check host file> --> This will run the GPU throttle check on the hosts provided in the file given. The gpu check host file should have a host name on each line.
 
-validate -e y -cn <cluster name file> --> This will run the GPU throttle check. The clusters considered will be from the file specified by -cn option. The number of nodes considered will be from the resize script using the clusters from the file. 
+validate -e y -cn <cluster name file> --> This will run the /etc/hosts md5 sum check. The clusters considered will be from the file specified by -cn option. The number of nodes considered will be from the resize script using the clusters from the file. 
 
 validate -e <md5 sum check host file> --> This will run the /etc/hosts md5 sum check on the hosts provided in the file given. The md5 sum check host file should have a host name on each line.
 

autoscaling/tf_init/bastion_update.tf

@@ -62,6 +62,7 @@ resource "local_file" "inventory" {
     instance_pool_ocpus=local.instance_pool_ocpus,
     queue=var.queue,
     instance_type=var.instance_type,
+    monitoring=var.monitoring,
     autoscaling_monitoring = var.autoscaling_monitoring,
     unsupported = var.unsupported,
     hyperthreading = var.hyperthreading,

autoscaling/tf_init/inventory.tpl

@@ -60,6 +60,7 @@ log_vol=${log_vol}
 ldap=${ldap}
 queue=${queue}
 instance_type=${instance_type}
+monitoring=${monitoring}
 hyperthreading=${hyperthreading}
 privilege_sudo=${privilege_sudo}
 privilege_group_name=${privilege_group_name}

autoscaling/tf_init/versions.tf

@@ -3,7 +3,7 @@ terraform {
   required_providers {
      oci = {
          source = "oracle/oci"
-         version = "4.115.0"
+         version = "5.1.0"
      }
   }
 }

conf/variables.tpl

@@ -116,6 +116,7 @@ variable "hyperthreading" { default = ##HT## }
 variable "unsupported" { default = ${unsupported} }
 variable "image_ocid" { default = "##IMAGE##" }
 variable "ldap" { default = ${ldap} }
+variable "monitoring" { default = ${monitoring} }
 variable "autoscaling_monitoring" { default = ${autoscaling_monitoring} }
 
 

playbooks/new_nodes.yml

@@ -46,6 +46,9 @@
   become: true
   gather_facts: true
   tasks: 
+    - include_role: 
+        name: oci-cn-auth
+      when: cluster_network|bool
     - include_role: 
         name: rdma-interface
       when: cluster_network|bool
@@ -200,6 +203,9 @@
     - include_role: 
         name: slurm
       when: slurm|default(false)|bool
+    - include_role: 
+        name: influxdb
+      when: monitoring|default(false)|bool
     - include_role: 
         name: telegraf
       when: monitoring|default(false)|bool

playbooks/resize_add.yml

@@ -44,6 +44,9 @@
   become: true
   gather_facts: true
   tasks: 
+    - include_role: 
+        name: oci-cn-auth
+      when: cluster_network|bool
     - include_role: 
         name: rdma-interface
       when: cluster_network|bool
@@ -202,6 +205,9 @@
     - include_role: 
         name: slurm
       when: slurm|default(false)|bool
+    - include_role: 
+        name: influxdb
+      when: monitoring|default(false)|bool
     - include_role: 
         name: telegraf
       when: monitoring|default(false)|bool

playbooks/roles/autoscaling_mon/tasks/el.yml

@@ -51,35 +51,9 @@
     sslcacert: /etc/pki/tls/certs/ca-bundle.crt
 
 - name: install grafana
-  vars: 
-    package_name: 
-      - grafana-8.5.21-1
-    package_state: present
   include_role: 
-    name: safe_yum
-
-- name: start grafana
-  become: true
-  service: 
-    name: grafana-server
-    state: restarted
-    enabled: true
-
-- name: Ensure grafana key directory exists
-  file:
-    path: "/etc/opt/oci-hpc/passwords/grafana"
-    state: directory
-  delegate_to: localhost
-
-- name: Check api key list
-  uri:
-    url: "{{ grafana_api_url }}/api/auth/keys"
-    user: "{{ grafana_security.admin_user }}"
-    password: "{{ grafana_security.admin_password }}"
-    force_basic_auth: true
-    return_content: true
-  no_log: false
-  register: existing_api_keys
+    name: grafana
+  when: not monitoring|default(false)|bool
 
 - name: install mysql-shell and connector
   vars: 

playbooks/roles/autoscaling_mon/tasks/ubuntu.yml

@@ -50,52 +50,10 @@
 #     sslverify: 1
 #     sslcacert: /etc/pki/tls/certs/ca-bundle.crt
 
-- name: Add grafana key
-  become: true
-  apt_key:
-    state: present
-    url: https://packages.grafana.com/gpg.key
-
-- name: Manage grafana APT repositories
-  become: true
-  apt_repository:
-    repo: deb https://packages.grafana.com/oss/deb stable main
-    state: present
-
 - name: install grafana
-  vars: 
-    package_name: 
-      - grafana-8.5.21-1
-    package_state: present
   include_role: 
-    name: safe_yum
-
-- name: start grafana
-  become: true
-  service: 
-    name: grafana-server
-    state: restarted
-    enabled: true
-
-- name: Ensure grafana key directory exists
-  file:
-    path: "/etc/opt/oci-hpc/passwords/grafana"
-    state: directory
-  delegate_to: localhost
-
-- name: Check api key list
-  uri:
-    url: "{{ grafana_api_url }}/api/auth/keys"
-    method: GET
-    user: "{{ grafana_security.admin_user }}"
-    password: "{{ grafana_security.admin_password }}"
-    force_basic_auth: true
-    return_content: true
-  no_log: false
-  register: existing_api_keys
-  retries: 5
-  delay: 5
-  until: existing_api_keys is not failed
+    name: grafana
+  when: not monitoring|default(false)|bool
 
 # - name: Import mysql-2022 key 
 #   become: true

playbooks/roles/fix_broken/tasks/ubuntu.yml

@@ -72,6 +72,14 @@
   delay: 10
   until: result.stdout | int == 0
 
+- name: Ensure lock file is removed
+  become: true
+  file: 
+    path: "/var/lib/apt/lists/lock"
+    state: absent
+  retries: 30
+  delay: 10
+  until: result.stdout | int == 0
 
 - name: Run apt-get update
   become: true
@@ -80,7 +88,6 @@
     PID1=$!
     wait $PID1
 
-
 - name: Run fix-broken
   become: true
   shell: |