Skip to content
This repository was archived by the owner on Apr 18, 2024. It is now read-only.

Commit 21ecf98

Browse files
smithzcsmithzc
committed
Merge branch '2.1.2'
2 parents c763fb2 + f1650f7 commit 21ecf98

File tree

15 files changed

+61
-132
lines changed

15 files changed

+61
-132
lines changed

‎scripts/boot_plus_tmp.sh

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -318,19 +318,9 @@ for i in `seq 1 ${#iqn[@]}`; do
318318
UUID=`lsblk -no UUID /dev/oracleoci/$disk`
319319
echo "UUID=$UUID /opt/cloudera ext4 defaults,_netdev,nofail,noatime,discard,barrier=0 0 2" | tee -a /etc/fstab
320320
;;
321-
oraclevdd|oraclevde|oraclevdf)
321+
oraclevdd|oraclevde|oraclevdf|oraclevdg)
322322
raid_disk_setup
323323
;;
324-
oraclevdg)
325-
raid_disk_setup
326-
mdadm -C /dev/md0 -l raid0 -n 4 /dev/oracleoci/oraclevd[d-g]1
327-
mkfs.ext4 /dev/md0
328-
mkdir -p /mnt/tmp
329-
mount /dev/md0 /mnt/tmp
330-
mount -B /tmp /mnt/tmp
331-
echo "/dev/md0 /mnt/tmp ext4 defaults,_netdev,noatime,discard,barrier=0 0 0" | tee -a /etc/fstab
332-
mdadm -E -s -v >> /etc/mdadm.conf
333-
;;
334324
*)
335325
mke2fs -F -t ext4 -b 4096 -E lazy_itable_init=1 -O sparse_super,dir_index,extent,has_journal,uninit_bg -m1 /dev/oracleoci/$disk
336326
block_data_mount
@@ -347,5 +337,16 @@ for i in `seq 1 ${#iqn[@]}`; do
347337
done;
348338
done;
349339
fi
340+
EXECNAME="TMP"
341+
log "->Setup LVM"
342+
vgcreate RAID0 /dev/oracleoci/oraclevd[d-g]1
343+
lvcreate -i 2 -I 64 -l 100%FREE -n tmp RAID0
344+
mkfs.ext4 /dev/RAID0/tmp
345+
mkdir -p /mnt/tmp
346+
chmod 1777 /mnt/tmp
347+
mount /dev/RAID0/tmp /mnt/tmp
348+
mount -B /tmp /mnt/tmp
349+
chmod 1777 /tmp
350+
echo "/dev/RAID0/tmp /tmp ext4 defaults,_netdev,noatime,discard,barrier=0 0 0" | tee -a /etc/fstab
350351
EXECNAME="END"
351352
log "->DONE"

‎terraform/compute.tf

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ module "bastion" {
55
compartment_ocid = "${var.compartment_ocid}"
66
subnet_id = "${module.network.bastion-id}"
77
availability_domain = "${lookup(data.oci_identity_availability_domains.ADs.availability_domains[var.availability_domain - 1],"name")}"
8+
image_ocid = "${var.InstanceImageOCID[var.region]}"
89
ssh_keypath = "${var.ssh_keypath}"
910
ssh_private_key = "${var.ssh_private_key}"
1011
ssh_public_key = "${var.ssh_public_key}"
@@ -22,6 +23,7 @@ module "utility" {
2223
compartment_ocid = "${var.compartment_ocid}"
2324
subnet_id = "${module.network.public-id}"
2425
availability_domain = "${lookup(data.oci_identity_availability_domains.ADs.availability_domains[var.availability_domain - 1],"name")}"
26+
image_ocid = "${var.InstanceImageOCID[var.region]}"
2527
ssh_keypath = "${var.ssh_keypath}"
2628
ssh_private_key = "${var.ssh_private_key}"
2729
ssh_public_key = "${var.ssh_public_key}"
@@ -39,6 +41,7 @@ module "master" {
3941
compartment_ocid = "${var.compartment_ocid}"
4042
subnet_id = "${module.network.private-id}"
4143
availability_domain = "${lookup(data.oci_identity_availability_domains.ADs.availability_domains[var.availability_domain - 1],"name")}"
44+
image_ocid = "${var.InstanceImageOCID[var.region]}"
4245
ssh_keypath = "${var.ssh_keypath}"
4346
ssh_private_key = "${var.ssh_private_key}"
4447
ssh_public_key = "${var.ssh_public_key}"
@@ -56,15 +59,15 @@ module "worker" {
5659
compartment_ocid = "${var.compartment_ocid}"
5760
subnet_id = "${module.network.private-id}"
5861
availability_domain = "${lookup(data.oci_identity_availability_domains.ADs.availability_domains[var.availability_domain - 1],"name")}"
62+
image_ocid = "${var.InstanceImageOCID[var.region]}"
5963
ssh_keypath = "${var.ssh_keypath}"
6064
ssh_private_key = "${var.ssh_private_key}"
6165
ssh_public_key = "${var.ssh_public_key}"
6266
private_key_path = "${var.private_key_path}"
6367
worker_instance_shape = "${var.worker_instance_shape}"
6468
log_volume_size_in_gbs = "${var.log_volume_size_in_gbs}"
6569
cloudera_volume_size_in_gbs = "${var.cloudera_volume_size_in_gbs}"
66-
replication_factor = "${var.replication_factor}"
67-
hdfs_usable_in_gbs = "${var.hdfs_usable_in_gbs}"
70+
block_volumes_per_worker = "${var.block_volumes_per_worker}"
6871
data_blocksize_in_gbs = "${var.data_blocksize_in_gbs}"
6972
user_data = "${base64encode(file("../scripts/boot.sh"))}"
7073
}

‎terraform/modules/bastion/main.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ resource "oci_core_instance" "Bastion" {
88

99
source_details {
1010
source_type = "image"
11-
source_id = "${var.InstanceImageOCID[var.region]}"
11+
source_id = "${var.image_ocid}"
1212
}
1313

1414
metadata {

‎terraform/modules/bastion/variables.tf

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ variable "ssh_private_key" {}
1212
variable "instances" {}
1313
variable "subnet_id" {}
1414
variable "user_data" {}
15+
variable "image_ocid" {}
1516

1617
# ---------------------------------------------------------------------------------------------------------------------
1718
# Optional variables
@@ -53,17 +54,3 @@ variable "ssh_keypath" {
5354
# You probably don't need to change these.
5455
# ---------------------------------------------------------------------------------------------------------------------
5556

56-
// See https://docs.us-phoenix-1.oraclecloud.com/images/
57-
// Oracle-provided image "Oracle-Linux-7.6-2019.01.17-0"
58-
// Kernel Version: 4.14.35-1844.1.3.el7uek.x86_64
59-
variable "InstanceImageOCID" {
60-
type = "map"
61-
default = {
62-
ca-toronto-1 = "ocid1.image.oc1.ca-toronto-1.aaaaaaaafozx4cw5fgcnptx6ukgdjjfzvjb2365chtzprratabynb573wria"
63-
eu-frankfurt-1 = "ocid1.image.oc1.eu-frankfurt-1.aaaaaaaagbrvhganmn7awcr7plaaf5vhabmzhx763z5afiitswjwmzh7upna"
64-
uk-london-1 = "ocid1.image.oc1.uk-london-1.aaaaaaaajwtut4l7fo3cvyraate6erdkyf2wdk5vpk6fp6ycng3dv2y3ymvq"
65-
us-ashburn-1 = "ocid1.image.oc1.iad.aaaaaaaawufnve5jxze4xf7orejupw5iq3pms6cuadzjc7klojix6vmk42va"
66-
us-phoenix-1 = "ocid1.image.oc1.phx.aaaaaaaadjnj3da72bztpxinmqpih62c2woscbp6l3wjn36by2cvmdhjub6a"
67-
}
68-
}
69-

‎terraform/modules/master/main.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ resource "oci_core_instance" "Master" {
1010

1111
source_details {
1212
source_type = "image"
13-
source_id = "${var.InstanceImageOCID[var.region]}"
13+
source_id = "${var.image_ocid}"
1414
}
1515

1616
metadata {

‎terraform/modules/master/variables.tf

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ variable "ssh_private_key" {}
1212
variable "instances" {}
1313
variable "subnet_id" {}
1414
variable "user_data" {}
15+
variable "image_ocid" {}
1516

1617
# ---------------------------------------------------------------------------------------------------------------------
1718
# Optional variables
@@ -65,18 +66,3 @@ variable "ssh_keypath" {
6566
# Constants
6667
# You probably don't need to change these.
6768
# ---------------------------------------------------------------------------------------------------------------------
68-
69-
// See https://docs.us-phoenix-1.oraclecloud.com/images/
70-
// Oracle-provided image "Oracle-Linux-7.6-2019.01.17-0"
71-
// Kernel Version: 4.14.35-1844.1.3.el7uek.x86_64
72-
variable "InstanceImageOCID" {
73-
type = "map"
74-
default = {
75-
ca-toronto-1 = "ocid1.image.oc1.ca-toronto-1.aaaaaaaafozx4cw5fgcnptx6ukgdjjfzvjb2365chtzprratabynb573wria"
76-
eu-frankfurt-1 = "ocid1.image.oc1.eu-frankfurt-1.aaaaaaaagbrvhganmn7awcr7plaaf5vhabmzhx763z5afiitswjwmzh7upna"
77-
uk-london-1 = "ocid1.image.oc1.uk-london-1.aaaaaaaajwtut4l7fo3cvyraate6erdkyf2wdk5vpk6fp6ycng3dv2y3ymvq"
78-
us-ashburn-1 = "ocid1.image.oc1.iad.aaaaaaaawufnve5jxze4xf7orejupw5iq3pms6cuadzjc7klojix6vmk42va"
79-
us-phoenix-1 = "ocid1.image.oc1.phx.aaaaaaaadjnj3da72bztpxinmqpih62c2woscbp6l3wjn36by2cvmdhjub6a"
80-
}
81-
}
82-

‎terraform/modules/network/data.tf

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,10 @@ data "oci_identity_availability_domains" "ADs" {
22
compartment_id = "${var.tenancy_ocid}"
33
}
44

5+
data "oci_core_services" "all_svcs_moniker" {
6+
filter {
7+
name = "name"
8+
values = ["All .* Services In Oracle Services Network"]
9+
regex = true
10+
}
11+
}

‎terraform/modules/network/main.tf

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,10 @@ resource "oci_core_nat_gateway" "nat_gateway" {
2121
display_name = "nat_gateway"
2222
}
2323

24-
data "oci_core_services" "cloudera_services" {
25-
}
26-
2724
resource "oci_core_service_gateway" "cloudera_service_gateway" {
2825
compartment_id = "${var.compartment_ocid}"
2926
services {
30-
service_id = "${data.oci_core_services.cloudera_services.services.1.id}"
27+
service_id = "${lookup(data.oci_core_services.all_svcs_moniker.services[0], "id")}"
3128
}
3229
vcn_id = "${oci_core_vcn.cloudera_vcn.id}"
3330
display_name = "Cloudera Service Gateway"

‎terraform/modules/utility/main.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ resource "oci_core_instance" "Utility" {
99

1010
source_details {
1111
source_type = "image"
12-
source_id = "${var.InstanceImageOCID[var.region]}"
12+
source_id = "${var.image_ocid}"
1313
}
1414

1515
metadata {

‎terraform/modules/utility/variables.tf

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ variable "ssh_private_key" {}
1212
variable "instances" {}
1313
variable "subnet_id" {}
1414
variable "user_data" {}
15+
variable "image_ocid" {}
1516

1617
# ---------------------------------------------------------------------------------------------------------------------
1718
# Optional variables
@@ -56,18 +57,3 @@ variable "ssh_keypath" {
5657
# Constants
5758
# You probably don't need to change these.
5859
# ---------------------------------------------------------------------------------------------------------------------
59-
60-
// See https://docs.us-phoenix-1.oraclecloud.com/images/
61-
// Oracle-provided image "Oracle-Linux-7.6-2019.01.17-0"
62-
// Kernel Version: 4.14.35-1844.1.3.el7uek.x86_64
63-
variable "InstanceImageOCID" {
64-
type = "map"
65-
default = {
66-
ca-toronto-1 = "ocid1.image.oc1.ca-toronto-1.aaaaaaaafozx4cw5fgcnptx6ukgdjjfzvjb2365chtzprratabynb573wria"
67-
eu-frankfurt-1 = "ocid1.image.oc1.eu-frankfurt-1.aaaaaaaagbrvhganmn7awcr7plaaf5vhabmzhx763z5afiitswjwmzh7upna"
68-
uk-london-1 = "ocid1.image.oc1.uk-london-1.aaaaaaaajwtut4l7fo3cvyraate6erdkyf2wdk5vpk6fp6ycng3dv2y3ymvq"
69-
us-ashburn-1 = "ocid1.image.oc1.iad.aaaaaaaawufnve5jxze4xf7orejupw5iq3pms6cuadzjc7klojix6vmk42va"
70-
us-phoenix-1 = "ocid1.image.oc1.phx.aaaaaaaadjnj3da72bztpxinmqpih62c2woscbp6l3wjn36by2cvmdhjub6a"
71-
}
72-
}
73-

0 commit comments

Comments
 (0)