scottk/terraform-talos
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/terraform-talos.git synced 2025-11-01 02:38:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Images capability

Browse Source
This commit is contained in:
Serge Logvinov
2021-12-19 11:25:03 +02:00
parent 32b2563794
commit 37cea512d3
9 changed files with 52 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
oracle/Makefile
View File

@@ -5,7 +5,8 @@ help:
@awk 'BEGIN {FS = ":.*?## "} /^[0-9a-zA-Z_-]+:.*?## / {sub("\\\\n",sprintf("\n%22c"," "), $$2);printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}' $(MAKEFILE_LIST) @awk 'BEGIN {FS = ":.*?## "} /^[0-9a-zA-Z_-]+:.*?## / {sub("\\\\n",sprintf("\n%22c"," "), $$2);printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}' $(MAKEFILE_LIST)
create-network: ## Create networks create-network: ## Create networks
cd prepare && terraform init && terraform apply -auto-approve cd prepare && terraform init && terraform apply -target=oci_core_vcn.main -auto-approve
cd prepare && terraform apply -auto-approve
create-lb: ## Create loadbalancer create-lb: ## Create loadbalancer
terraform init terraform init

2
oracle/init/output.tf
View File

@@ -1,7 +1,7 @@
output "compartment_ocid" { output "compartment_ocid" {
description = "compartment id" description = "compartment id"
value = oci_identity_compartment.project.compartment_id value = oci_identity_compartment.project.id
} }
output "user_ocid" { output "user_ocid" {

6
oracle/init/policy.tf
View File

@@ -8,8 +8,12 @@ resource "oci_identity_policy" "terraform" {
"Allow group ${oci_identity_group.terraform.name} to manage virtual-network-family in compartment ${oci_identity_compartment.project.name}", "Allow group ${oci_identity_group.terraform.name} to manage virtual-network-family in compartment ${oci_identity_compartment.project.name}",
"Allow group ${oci_identity_group.terraform.name} to manage load-balancers in compartment ${oci_identity_compartment.project.name}", "Allow group ${oci_identity_group.terraform.name} to manage load-balancers in compartment ${oci_identity_compartment.project.name}",
"Allow group ${oci_identity_group.terraform.name} to manage compute-management-family in compartment ${oci_identity_compartment.project.name}", "Allow group ${oci_identity_group.terraform.name} to manage compute-management-family in compartment ${oci_identity_compartment.project.name}",
"Allow group ${oci_identity_group.terraform.name} to manage instances in compartment ${oci_identity_compartment.project.name}",
"Allow group ${oci_identity_group.terraform.name} to manage instance-family in compartment ${oci_identity_compartment.project.name}", "Allow group ${oci_identity_group.terraform.name} to manage instance-family in compartment ${oci_identity_compartment.project.name}",
"Allow group ${oci_identity_group.terraform.name} to manage instance-images in compartment ${oci_identity_compartment.project.name}", "Allow group ${oci_identity_group.terraform.name} to manage compute-image-capability-schema in compartment ${oci_identity_compartment.project.name}",
"Allow group ${oci_identity_group.terraform.name} to read objectstorage-namespaces in compartment ${oci_identity_compartment.project.name}",
"Allow group ${oci_identity_group.terraform.name} to manage buckets in compartment ${oci_identity_compartment.project.name}",
"Allow group ${oci_identity_group.terraform.name} to manage objects in compartment ${oci_identity_compartment.project.name}",
] ]
} }

5
oracle/prepare/auth.tf
View File

@@ -7,7 +7,6 @@ provider "oci" {
tenancy_ocid = var.tenancy_ocid tenancy_ocid = var.tenancy_ocid
user_ocid = var.user_ocid user_ocid = var.user_ocid
fingerprint = var.fingerprint fingerprint = var.fingerprint
private_key_path = "~/.oci/oci_api_key.pem" private_key_path = var.key_file
region = var.region
region = var.region
} }

2
oracle/prepare/bucket.tf
View File

@@ -4,7 +4,7 @@ resource "random_id" "backet" {
} }
resource "oci_objectstorage_bucket" "images" { resource "oci_objectstorage_bucket" "images" {
compartment_id = var.tenancy_ocid compartment_id = var.compartment_ocid
namespace = data.oci_objectstorage_namespace.ns.namespace namespace = data.oci_objectstorage_namespace.ns.namespace
name = "${var.project}-images-${random_id.backet.hex}" name = "${var.project}-images-${random_id.backet.hex}"
access_type = "NoPublicAccess" access_type = "NoPublicAccess"

10
oracle/prepare/common.tf
View File

@@ -1,6 +1,10 @@
data "oci_identity_availability_domains" "main" { data "oci_identity_availability_domains" "main" {
compartment_id = var.tenancy_ocid compartment_id = var.compartment_ocid
}
data "oci_objectstorage_namespace" "ns" {
compartment_id = var.compartment_ocid
} }
locals { locals {
@@ -14,7 +18,3 @@ data "oci_core_services" "object_store" {
regex = true regex = true
} }
} }
data "oci_objectstorage_namespace" "ns" {
compartment_id = var.tenancy_ocid
}

97
oracle/prepare/images.tf
View File

@@ -16,10 +16,10 @@ resource "oci_objectstorage_object" "talos_arm64" {
} }
resource "oci_core_image" "talos_amd64" { resource "oci_core_image" "talos_amd64" {
compartment_id = var.tenancy_ocid compartment_id = var.compartment_ocid
display_name = "Talos-amd64" display_name = "Talos-amd64"
launch_mode = "NATIVE" launch_mode = "PARAVIRTUALIZED"
image_source_details { image_source_details {
source_type = "objectStorageTuple" source_type = "objectStorageTuple"
@@ -38,10 +38,10 @@ resource "oci_core_image" "talos_amd64" {
} }
resource "oci_core_image" "talos_arm64" { resource "oci_core_image" "talos_arm64" {
compartment_id = var.tenancy_ocid compartment_id = var.compartment_ocid
display_name = "Talos-arm64" display_name = "Talos-arm64"
launch_mode = "NATIVE" launch_mode = "PARAVIRTUALIZED"
image_source_details { image_source_details {
source_type = "objectStorageTuple" source_type = "objectStorageTuple"
@@ -59,69 +59,36 @@ resource "oci_core_image" "talos_arm64" {
} }
} }
# resource "oci_core_compute_image_capability_schema" "talos_amd64" { data "oci_core_compute_global_image_capability_schemas" "default" {}
# compartment_id = var.tenancy_ocid data "oci_core_compute_global_image_capability_schemas_version" "default" {
compute_global_image_capability_schema_id = data.oci_core_compute_global_image_capability_schemas.default.compute_global_image_capability_schemas[0].id
compute_global_image_capability_schema_version_name = data.oci_core_compute_global_image_capability_schemas.default.compute_global_image_capability_schemas[0].current_version_name
}
# compute_global_image_capability_schema_version_name = data.oci_core_compute_global_image_capability_schemas_version.default.name resource "oci_core_compute_image_capability_schema" "talos_amd64" {
compartment_id = var.compartment_ocid
compute_global_image_capability_schema_version_name = data.oci_core_compute_global_image_capability_schemas.default.compute_global_image_capability_schemas[0].current_version_name
# display_name = "Talos-amd64" display_name = "Talos-amd64"
# image_id = oci_core_image.talos_amd64.id image_id = oci_core_image.talos_amd64.id
schema_data = {
"Storage.BootVolumeType" = "{\"descriptorType\":\"enumstring\",\"values\":[\"SCSI\",\"IDE\",\"PARAVIRTUALIZED\"],\"defaultValue\":\"PARAVIRTUALIZED\",\"source\":\"IMAGE\"}",
}
}
# schema_data = { resource "oci_core_compute_image_capability_schema" "talos_arm64" {
# "Storage.BootVolumeType" = "{\"descriptorType\":\"enumstring\",\"values\":[\"SCSI\",\"IDE\",\"PARAVIRTUALIZED\"],\"defaultValue\":\"PARAVIRTUALIZED\",\"source\":\"GLOBAL\"}", compartment_id = var.compartment_ocid
# } compute_global_image_capability_schema_version_name = data.oci_core_compute_global_image_capability_schemas.default.compute_global_image_capability_schemas[0].current_version_name
# }
# data "oci_core_compute_image_capability_schemas" "talos_amd64" { display_name = "Talos-arm64"
# compartment_id = var.tenancy_ocid image_id = oci_core_image.talos_arm64.id
# image_id = oci_core_image.talos_amd64.id schema_data = {
# } "Storage.BootVolumeType" = "{\"descriptorType\":\"enumstring\",\"values\":[\"SCSI\",\"IDE\",\"PARAVIRTUALIZED\"],\"defaultValue\":\"PARAVIRTUALIZED\",\"source\":\"IMAGE\"}",
}
}
# data "oci_core_compute_global_image_capability_schemas_versions" "default" { resource "oci_core_shape_management" "talos_arm64" {
# compute_global_image_capability_schema_id = data.oci_core_compute_global_image_capability_schema.default.id compartment_id = var.compartment_ocid
# } image_id = oci_core_image.talos_arm64.id
shape_name = "VM.Standard.A1.Flex"
# data "oci_core_compute_global_image_capability_schemas" "default" { }
# display_name = "OCI.ComputeGlobalImageCapabilitySchema"
# }
# data "oci_core_compute_global_image_capability_schema" "default" {
# compute_global_image_capability_schema_id = data.oci_core_compute_global_image_capability_schemas.default.compute_global_image_capability_schemas[0].id
# }
# data "oci_core_compute_global_image_capability_schemas_version" "default" {
# compute_global_image_capability_schema_id = data.oci_core_compute_global_image_capability_schema.default.id
# compute_global_image_capability_schema_version_name = data.oci_core_compute_global_image_capability_schemas_versions.default.compute_global_image_capability_schema_versions[0].name
# }
# data "oci_core_compute_image_capability_schema" "test_compute_image_capability_schema" {
# compute_image_capability_schema_id = oci_core_compute_image_capability_schema.test_compute_image_capability_schema.id
# is_merge_enabled = "true"
# }
# resource "oci_core_compute_image_capability_schema" "test_compute_image_capability_schema" {
# compartment_id = var.tenancy_ocid
# compute_global_image_capability_schema_version_name = data.oci_core_compute_global_image_capability_schemas_versions.test_compute_global_image_capability_schemas_versions_datasource.compute_global_image_capability_schema_versions[0].name
# display_name = "displayName"
# image_id = oci_core_image.talos_amd64.id
# schema_data = {
# "Storage.BootVolumeType" = "{\"descriptorType\":\"enumstring\",\"values\":[\"SCSI\",\"IDE\",\"PARAVIRTUALIZED\"],\"defaultValue\":\"PARAVIRTUALIZED\",\"source\":\"GLOBAL\"}",
# }
# }
# data "oci_core_compute_global_image_capability_schemas_version" "test_compute_global_image_capability_schemas_version_datasource" {
# compute_global_image_capability_schema_id = data.oci_core_compute_global_image_capability_schema.test_compute_global_image_capability_schema_datasource.id
# compute_global_image_capability_schema_version_name = data.oci_core_compute_global_image_capability_schemas_versions.test_compute_global_image_capability_schemas_versions_datasource.compute_global_image_capability_schema_versions[0].name
# }
# data "oci_core_compute_global_image_capability_schemas_versions" "test_compute_global_image_capability_schemas_versions_datasource" {
# compute_global_image_capability_schema_id = data.oci_core_compute_global_image_capability_schema.test_compute_global_image_capability_schema_datasource.id
# }
# data "oci_core_compute_global_image_capability_schema" "test_compute_global_image_capability_schema_datasource" {
# compute_global_image_capability_schema_id = data.oci_core_compute_global_image_capability_schemas.test_compute_global_image_capability_schemas_datasource.compute_global_image_capability_schemas[0].id
# }
# data "oci_core_compute_global_image_capability_schemas" "test_compute_global_image_capability_schemas_datasource" {
# }

3
oracle/prepare/network.tf
View File

@@ -1,7 +1,6 @@
resource "oci_core_vcn" "main" { resource "oci_core_vcn" "main" {
compartment_id = var.tenancy_ocid compartment_id = var.compartment_ocid
display_name = var.project display_name = var.project
cidr_blocks = [var.vpc_main_cidr] cidr_blocks = [var.vpc_main_cidr]
is_ipv6enabled = true is_ipv6enabled = true

3
oracle/prepare/variables.tf
View File

@@ -3,6 +3,9 @@ variable "compartment_ocid" {}
variable "tenancy_ocid" {} variable "tenancy_ocid" {}
variable "user_ocid" {} variable "user_ocid" {}
variable "fingerprint" {} variable "fingerprint" {}
variable "key_file" {
default = "~/.oci/oci_public.pem"
}
variable "project" { variable "project" {
type = string type = string