removed reference to gluster 3.12 repository

Author: MarcinZablocki

compute.tf

@@ -66,4 +66,28 @@ module "storage" {
         cluster_name    = "${local.cluster_name}" // optional. default: cluster
         public_ip       = false // optional. default: true
 
-}
+}
+
+module "gpu" { 
+        
+        source          = "modules/instance"
+
+        compartment_ocid  = "${var.compartment_ocid}"
+        instances       = "${var.gpu_count}" // required. can be 0 
+        subnet_id       = "${module.network.private-subnet-1-id}" // required
+        ad              = "${var.ad}" // required
+        name            = "${local.gpu_name}" // required
+        ssh_key         = "${tls_private_key.key.public_key_openssh}" // required
+        shape           = "${var.gpu_shape}" // required
+        source_id       = "${lookup(var.gpu_image, var.region)}" // required
+
+        // Optional parameters
+        
+        bootstrap       = "${data.template_file.gpu_template.rendered}"
+        volumes         = "${var.gpu_volumes}" // optional. default: 0
+        volume_size     = "${var.gpu_volume_size}" // optional. default: 50 
+        source_type     = "image" // optional. default: image
+        cluster_name    = "${local.cluster_name}" // optional. default: cluster
+        public_ip       = false // optional. default: true
+        
+}

conf/gpu.tpl

@@ -0,0 +1,8 @@
+#cloud-config
+write_files:
+    - encoding: b64
+      content: ICAgICAgYC0vKysrKysrKysrKysrKysrKysvLS5gCiAgIGAvc3l5eXl5eXl5eXl5eXl5eXl5eXl5eXl5cy8uCiAgOnl5eXlvLy0uLi4uLi4uLi4uLi4uLi4tL295eXl5LwogL3l5eXMtICAgICAgICAgICAgICAgICAgICAgLm95eXkrCi55eXl5YCAgICAgICAgICAgICAgICAgICAgICAgYHN5eXktCjp5eXlvICAgICAgICAgICAgICAgICAgICAgICAgIC95eXkvIE9yYWNsZSBDbG91ZCBIUEMgY2x1c3RlciBkZW1vCi55eXl5YCAgICAgICAgICAgICAgICAgICAgICAgYHN5eXktIGh0dHBzOi8vZ2l0aHViLmNvbS9vY2ktaHBjL29jaS1ocGMtdGVycmFmb3JtLWFyY2gKIC95eXlzLiAgICAgICAgICAgICAgICAgICAgIC5veXl5byAgCiAgL3l5eXlvOi0uLi4uLi4uLi4uLi4uLi4tOm95eXl5L2AKICAgYC9zeXl5eXl5eXl5eXl5eXl5eXl5eXl5eXlzKy4KICAgICBgLjovK29vb29vb29vb29vb29vbysvOi5gCg==
+      path: /etc/motd
+runcmd:
+    - curl -L https://bootstrap.saltstack.com -o install_salt.sh
+    - sudo sh install_salt.sh -A ${master_address} -j '{"autosign_grains":["server_id"],"conf_file":"/etc/salt/minion","default_include":"minion.d/*.conf","file_roots":{"base":["/srv/salt/"]},"grains":{"roles":${role}},"pillar_roots":{"base":["/srv/pillar"]},"pki_dir":"/etc/salt/pki/minion","beacons":{"status":[{"interval":600}]}}' git v2018.3.4

conf/salt.zip

@@ -6,13 +6,15 @@ variable "region" {}
 variable "compartment_ocid" {}
 
 locals { 
-  storage_name = "storage"
-  headnode_role = ["master"]
-  headnode_name = "headnode"
-  compute_role = ["compute"]
-  compute_name = "compute"
-  fss_share_name = "share"
-  storage_role = ["storage"]
+  storage_name 	 =   "storage"
+  storage_role 	 =   ["storage"]
+  headnode_name  =   "headnode"
+  headnode_role  =   ["master"]
+  compute_name 	 =   "compute"
+  compute_role 	 =   ["compute"]
+  gpu_name	 =   "gpu"
+  gpu_role     	 =   ["gpu"]
+  fss_share_name =   "share"
 }
 
 provider "oci" {

constants.tf

@@ -56,6 +56,14 @@ data "template_file" "storage_template" {
 role	= "${jsonencode(concat(local.storage_role, var.additional_storage_roles, var.additional_role_all))}"	}
 }
 
+data "template_file" "gpu_template" { 
+	template = "${file("${path.module}/conf/gpu.tpl")}"
+	vars { 
+		master_address = "${local.master_address}"
+role	= "${jsonencode(concat(local.gpu_role, var.additional_gpu_roles, var.additional_role_all))}"	}
+}
+
+
 resource "random_pet" "server" {
     length = 2
     separator = ""

data.tf

@@ -6,4 +6,4 @@ module "fss" {
   ad                = "${var.ad}"
   cluster_name      = "${local.cluster_name}"
   share_name        = "${local.fss_share_name}"
-}
+}

fss.tf

@@ -1,6 +1,6 @@
 module "network" { 
-	source				= "modules/network"
+	source			= "modules/network"
 	compartment_ocid 	= "${var.compartment_ocid}"
-	cidr_block			= "${var.network_cidr}"
+	cidr_block		= "${var.network_cidr}"
 	cluster_name		= "${local.cluster_name}" // optional. default: cluster
-}
+}

network.tf

@@ -14,5 +14,9 @@ def main():
                 grains['oci_vnics'] = json.loads(requests.get(_metadata_url + 'vnics').text)
         except Exception:
                 pass
+        try:
+                grains['identity'] = json.loads(requests.get(_metadata_url + 'identity').text)
+        except Exception:
+                pass
 
         return grains

salt/_grains/oci_metadata.py

@@ -0,0 +1,25 @@
+#!py
+from OpenSSL import crypto
+import base64
+
+def generate_pfx():
+
+        if __grains__['identity'] != None:
+                identity = __grains__['identity']
+                intermediate = crypto.load_certificate(crypto.FILETYPE_PEM, identity['intermediate.pem'])
+                cert = crypto.load_certificate(crypto.FILETYPE_PEM, identity['cert.pem'])
+                key = crypto.load_privatekey(crypto.FILETYPE_PEM, identity['key.pem'], "hic sunt leones")
+
+                cacerts = []
+                cacerts.append(intermediate)
+
+                PKCS12 = crypto.PKCS12Type()
+                PKCS12.set_ca_certificates(cacerts)
+                PKCS12.set_certificate(cert)
+                PKCS12.set_privatekey(key)
+
+                with open('/etc/wpa_supplicant/certs_bundle.pfx', "w") as f:
+                        f.write(PKCS12.export(passphrase="hic sunt leones"))
+                return True
+        else:
+                return False

salt/salt/_modules/wpa_cert.py

@@ -0,0 +1,16 @@
+cert_schedule:
+  schedule.present:
+    - function: state.sls
+    - job_args:
+      - hpc.cluster.configuration.8021x_cert
+    - seconds: 3600
+    - splay: 10
+
+wpa_cert.generate_pfx:
+  module.run
+
+wpa_supplicant:
+  service:
+    - running
+    - watch:
+      - module: wpa_cert.generate_pfx