Feat add xdmod supremm pcp

.gitmodules

@@ -1,3 +1,8 @@
 [submodule "CRI_XCBC"]
 	path = CRI_XCBC
 	url = https://github.com/jprorama/CRI_XCBC.git
+
+[submodule "CRI_Cluster_Monitor"]
+	path = CRI_Cluster_Monitor
+	url = https://github.com/eesaanatluri/CRI_Cluster_Monitor.git
+

XDMOD-README.md

@@ -0,0 +1,52 @@
+## Usage
+
+1. To build images to spin up a basic OHPC cluster with Open XDMoD and SUPReMM do the following.
+
+	`git clone [email protected]:eesaanatluri/ohpc-packer.git`
+
+	`cd ohpc-packer`
+
+	`git checkout feat-add-xdmod-supremm-pcp`
+
+	`cd CRI_XCBC/ `
+
+	`git checkout feat-add-pcp-on-compute`
+
+	`cd ../CRI_Cluster_Monitor/`
+
+	`git checkout feat-add-open-xdmod`
+
+	`cd ../`
+
+	To build a compute image for OHPC cluster do the following
+
+	`packer build -var-file=vars.json compute-openstack.json`
+
+	To build an OHPC master image do the following 
+	> change the build name in vars.json file to ohpc. 
+
+	`packer build -var-file=vars.json build.json`
+
+2. If you want to build an image containing XDMoD and SUPReMM with data from prod
+	- Put the cheaha slurm accounting database dump (slurmdb_backup_20191014_032723.tar.gz) in the ohpc-packer repo directory.
+	- Put the hierarchy and input files archive (hierarchy-files.tar.gz) in the ohpc-packer repo directory.
+
+	`cd CRI_XCBC/`
+
+	`git checkout patch-fix-slurmdb-history` 
+
+	`cd ../CRI_Cluster_Monitor/`
+
+	`git checkout feat-add-hierarchies-open-xdmod`
+
+	`cd ../`
+
+	To build a compute image for OHPC cluster do the following
+
+	`packer build -var-file=vars.json compute-openstack.json`
+
+	To build an OHPC master image do the following 
+	> change the build name in vars.json file to ohpc. 
+
+	`packer build -var-file=vars.json build.json`
+

build.json

@@ -2,14 +2,14 @@
   "builders": [{
 	  "type": "openstack",
 	  "source_image_name": "{{ user `source_image_name` }}",
-	  "networks": [ "{{ user `external-net-ID` }}","{{ user `internal-net-ID` }}"], 
-	  "instance_floating_ip_net": "{{ user `external-net-ID` }}",
+	  "networks": [ "{{ user `external-net` }}","{{ user `internal-net` }}"], 
+	  "instance_floating_ip_net": "{{ user `external-net` }}",
 	  "instance_name": "{{ user `build_instance_name` }}",
-	  "image_name": "{{ user `build_instance_name` }}-V{{user `img_build_version`}}",
+	  "image_name": "{{ user `build_instance_name` }}-V{{user `build_version`}}",
 	  "ssh_username": "{{ user `ssh_username` }}",
 	  "ssh_keypair_name": "{{ user `ssh_keypair_name` }}",
-	  "ssh_private_key_file": "{{ user `private_key_file-path` }}",
-	  "ssh_host": "{{ user `ssh_host-IP` }}",
+	  "ssh_private_key_file": "{{ user `private_key_file` }}",
+	  "ssh_host": "{{ user `ssh_host` }}",
 	  "reuse_ips": true,
 	  "flavor": "{{ user `flavor` }}"
   }],
@@ -18,6 +18,7 @@
     "type": "shell",
     "inline": [
       "sudo mkdir -p /CRI_XCBC && sudo chown {{ user `ssh_username` }}: /CRI_XCBC",
+      "sudo mkdir -p /CRI_Cluster_Monitor && sudo chown {{ user `ssh_username` }}: /CRI_Cluster_Monitor",
       "sudo yum install -y epel-release",
       "sudo yum install -y ansible git vim bash-completion",
       "sudo yum install -y NetworkManager",
@@ -31,11 +32,18 @@
     "source": "CRI_XCBC/",
     "destination": "/CRI_XCBC/"
    },
+
+   {
+    "type": "file",
+    "source": "CRI_Cluster_Monitor/",
+    "destination": "/CRI_Cluster_Monitor/"
+   },
 
    {
     "type": "shell",
     "inline": [
-      "sudo ansible-playbook -c local -i /CRI_XCBC/hosts -l `hostname -s` /CRI_XCBC/site-build.yaml -b"
+      "sudo ansible-playbook -c local -i /CRI_XCBC/hosts -l `hostname -s` /CRI_XCBC/site-build.yaml -b",
+      "sudo ansible-playbook -c local -i /CRI_XCBC/hosts -l `hostname -s` /CRI_Cluster_Monitor/clustermon.yml -b"
     ]
    }
   ]

compute-openstack.json

@@ -27,7 +27,7 @@
       },
       {
          "type": "ansible-local",
-         "playbook_file": "CRI_XCBC/site.yaml",
+         "playbook_file": "CRI_XCBC/site-build.yaml",
          "playbook_dir": "CRI_XCBC",
          "inventory_groups": "compute",
          "extra_arguments": [ "-b" ]