Refresh and clean up

oracle-quickstart · Mar 26, 2021 · 130112c · 130112c
1 parent 2c3bfcc
commit 130112c
Show file tree

Hide file tree

Showing 31 changed files with 30 additions and 1,123 deletions.
diff --git a/README.md b/README.md
@@ -8,7 +8,7 @@ For details of the architecture, see [_Deploy Jenkins in master/agent mode_](htt
 
 - Permission to `manage` the following types of resources in your Oracle Cloud Infrastructure tenancy: `vcns`, `internet-gateways`, `load-balancers`, `route-tables`, `security-lists`, `subnets`, and `instances`.
 
-- Quota to create the following resources: 1 VCN, 2 subnets, 1 Internet Gateway, 1 NAT Gateway, 2 route rules, and 4 compute instances (bastion host, 1 master Jenkins node and 2 slave Jenkins nodes).
+- Quota to create the following resources: 1 VCN, 2 subnets, 1 Internet Gateway, 1 NAT Gateway, 2 route rules, and 4 compute instances (bastion host, 1 master Jenkins node and 2 agent Jenkins nodes).
 
 If you don't have the required permissions and quota, contact your tenancy administrator. See [Policy Reference](https://docs.cloud.oracle.com/en-us/iaas/Content/Identity/Reference/policyreference.htm), [Service Limits](https://docs.cloud.oracle.com/en-us/iaas/Content/General/Concepts/servicelimits.htm), [Compartment Quotas](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/resourcequotas.htm).
 

diff --git a/main.tf b/main.tf
@@ -28,23 +28,20 @@ resource "oci_core_instance" "JenkinsBastion" {
 # DEPLOY THE JENKINS CLUSTER
 # ------------------------------------------------------------------------------
 module "jenkins" {
-#  source              = "./modules/jenkins"
   source 	            = "github.com/oracle-quickstart/oci-jenkins"
   compartment_ocid    = var.compartment_ocid
   jenkins_version     = var.jenkins_version
   jenkins_password    = var.jenkins_password
   master_ad           = data.template_file.ad_names[0].rendered
   master_subnet_id    = oci_core_subnet.JenkinsMasterSubnetAD.id
-#  master_image_id     = data.oci_core_images.InstanceImageOCID.images[0].id
   master_image_id     = lookup(data.oci_core_images.InstanceImageOCID.images[0], "id")
   master_shape        = var.master_shape
-#  plugins             = var.plugins
   plugins             = split(",", var.plugins)
-  slave_count         = var.slave_count
-  slave_ads           = data.template_file.ad_names.*.rendered
-  slave_subnet_ids    = split(",", join(",", oci_core_subnet.JenkinsSlaveSubnetAD.*.id))
-  slave_image_id      = data.oci_core_images.InstanceImageOCID.images[0].id
-  slave_shape         = var.slave_shape
+  agent_count         = var.agent_count
+  agent_ads           = data.template_file.ad_names.*.rendered
+  agent_subnet_ids    = split(",", join(",", oci_core_subnet.JenkinsAgentSubnetAD.*.id))
+  agent_image_id      = data.oci_core_images.InstanceImageOCID.images[0].id
+  agent_shape         = var.agent_shape
   ssh_authorized_keys = tls_private_key.public_private_key_pair.public_key_openssh
   ssh_private_key     = tls_private_key.public_private_key_pair.private_key_pem
   bastion_host        = oci_core_instance.JenkinsBastion.public_ip

diff --git a/modules/jenkins/LICENSE b/modules/jenkins/LICENSE
diff --git a/modules/jenkins/README.md b/modules/jenkins/README.md
diff --git a/modules/jenkins/images/architecture.png b/modules/jenkins/images/architecture.png
diff --git a/modules/jenkins/main.tf b/modules/jenkins/main.tf
diff --git a/modules/jenkins/modules/jenkins-master/env-vars b/modules/jenkins/modules/jenkins-master/env-vars
diff --git a/modules/jenkins/modules/jenkins-master/main.tf b/modules/jenkins/modules/jenkins-master/main.tf
diff --git a/modules/jenkins/modules/jenkins-master/outputs.tf b/modules/jenkins/modules/jenkins-master/outputs.tf
diff --git a/modules/jenkins/modules/jenkins-master/scripts/default-user.groovy b/modules/jenkins/modules/jenkins-master/scripts/default-user.groovy