From 4c41981a9be0aab7579a15c7eb659c96f8270e35 Mon Sep 17 00:00:00 2001 From: Jay Patel <78554593+jarpat@users.noreply.github.com> Date: Fri, 17 Nov 2023 15:59:17 -0500 Subject: [PATCH] docs: (IAC-1222) Remove CR Variables from Example Files (#95) --- TODO.md | 2 ++ docs/REQUIREMENTS.md | 10 ---------- examples/bare-metal/sample-ansible-vars.yaml | 3 --- examples/bare-metal/sample-inventory | 12 ------------ .../bare-metal/sample-inventory-internal-postgres | 12 ------------ examples/vsphere/sample-terraform-dhcp.tfvars | 7 ------- examples/vsphere/sample-terraform-minimal.tfvars | 7 ------- examples/vsphere/sample-terraform-static-ips.tfvars | 7 ------- .../sample-terraform-static-singlestore.tfvars | 7 ------- examples/vsphere/sample-terraform-vi.tfvars | 7 ------- variables.tf | 2 +- 11 files changed, 3 insertions(+), 73 deletions(-) create mode 100644 TODO.md diff --git a/TODO.md b/TODO.md new file mode 100644 index 0000000..6aa69ec --- /dev/null +++ b/TODO.md @@ -0,0 +1,2 @@ +## Complete Container Registry Setup +- Make updates to the `/systems/container_registry` role to fully set up a Harbor Registry for a user. \ No newline at end of file diff --git a/docs/REQUIREMENTS.md b/docs/REQUIREMENTS.md index e09b5b5..f184553 100644 --- a/docs/REQUIREMENTS.md +++ b/docs/REQUIREMENTS.md @@ -367,13 +367,6 @@ nfs_memory = 16384 # 16 GB nfs_disk_size = 500 # 500 GB nfs_ip = "10.18.0.12" # Assigned values for static IPs -# Container Registry -create_cr = false # Creation flag -cr_num_cpu = 4 # 4 CPUs -cr_memory = 8092 # 8 GB -cr_disk_size = 250 # 250 GB -cr_ip = "10.18.0.13" # Assigned values for static IPs - # PostgreSQL server # # Suggested server specs shown below. @@ -634,9 +627,6 @@ jump_ip : "" # NFS Server nfs_ip : "" -# Container Registry -cr_ip : "" - # PostgreSQL Servers ``` diff --git a/examples/bare-metal/sample-ansible-vars.yaml b/examples/bare-metal/sample-ansible-vars.yaml index cc479b6..0480c7b 100644 --- a/examples/bare-metal/sample-ansible-vars.yaml +++ b/examples/bare-metal/sample-ansible-vars.yaml @@ -141,6 +141,3 @@ jump_ip : "" # NFS Server nfs_ip : "" - -# Container Registry -cr_ip : "" diff --git a/examples/bare-metal/sample-inventory b/examples/bare-metal/sample-inventory index 757c846..dd0897f 100644 --- a/examples/bare-metal/sample-inventory +++ b/examples/bare-metal/sample-inventory @@ -49,18 +49,6 @@ FIXME - ENTER YOUR NFS SERVER IP/FQDN HERE! [nfs:children] nfs_server -# -# Container Registry -# -[cr_server] -FIXME - ENTER YOUR CR SERVER IP/FQDN HERE! - -# -# Container Registry - alias - DO NOT MODIFY -# -[cr:children] -cr_server - # # Postgres Servers # diff --git a/examples/bare-metal/sample-inventory-internal-postgres b/examples/bare-metal/sample-inventory-internal-postgres index 64a98e9..696eaeb 100644 --- a/examples/bare-metal/sample-inventory-internal-postgres +++ b/examples/bare-metal/sample-inventory-internal-postgres @@ -53,18 +53,6 @@ FIXME - ENTER YOUR NFS SERVER IP/FQDN HERE! [nfs:children] nfs_server -# -# Container Registry -# -[cr_server] -FIXME - ENTER YOUR CR SERVER IP/FQDN HERE! - -# -# Container Registry - alias - DO NOT MODIFY -# -[cr:children] -cr_server - # # All systems # diff --git a/examples/vsphere/sample-terraform-dhcp.tfvars b/examples/vsphere/sample-terraform-dhcp.tfvars index f32981f..fdbdee5 100644 --- a/examples/vsphere/sample-terraform-dhcp.tfvars +++ b/examples/vsphere/sample-terraform-dhcp.tfvars @@ -189,13 +189,6 @@ nfs_memory = 16384 # 16 GB nfs_disk_size = 500 # 500 GB nfs_ip = "" # Assigned values for static IPs -# Container Registry -create_cr = false # Creation flag -cr_num_cpu = 4 # 4 CPUs -cr_memory = 8092 # 8 GB -cr_disk_size = 250 # 250 GB -cr_ip = "" # Assigned values for static IPs - # Postgres Servers postgres_servers = { default = { diff --git a/examples/vsphere/sample-terraform-minimal.tfvars b/examples/vsphere/sample-terraform-minimal.tfvars index 01f93c3..29f0ff0 100644 --- a/examples/vsphere/sample-terraform-minimal.tfvars +++ b/examples/vsphere/sample-terraform-minimal.tfvars @@ -151,13 +151,6 @@ nfs_memory = 16384 # 16 GB nfs_disk_size = 500 # 500 GB nfs_ip = "" # Assigned values for static IPs -# Container Registry -create_cr = false # Creation flag -cr_num_cpu = 4 # 4 CPUs -cr_memory = 8092 # 8 GB -cr_disk_size = 250 # 250 GB -cr_ip = "" # Assigned values for static IPs - # Postgres Servers postgres_servers = { default = { diff --git a/examples/vsphere/sample-terraform-static-ips.tfvars b/examples/vsphere/sample-terraform-static-ips.tfvars index d0c1e68..156a911 100644 --- a/examples/vsphere/sample-terraform-static-ips.tfvars +++ b/examples/vsphere/sample-terraform-static-ips.tfvars @@ -190,13 +190,6 @@ nfs_memory = 16384 # 16 GB nfs_disk_size = 500 # 500 GB nfs_ip = "" # Assigned values for static IPs -# Container Registry -create_cr = true # Creation flag -cr_num_cpu = 4 # 4 CPUs -cr_memory = 8092 # 8 GB -cr_disk_size = 250 # 250 GB -cr_ip = "" # Assigned values for static IPs - # Postgres Servers postgres_servers = { default = { diff --git a/examples/vsphere/sample-terraform-static-singlestore.tfvars b/examples/vsphere/sample-terraform-static-singlestore.tfvars index ca48535..9fe6bdc 100644 --- a/examples/vsphere/sample-terraform-static-singlestore.tfvars +++ b/examples/vsphere/sample-terraform-static-singlestore.tfvars @@ -216,13 +216,6 @@ nfs_memory = 16384 # 16 GB nfs_disk_size = 500 # 500 GB nfs_ip = "" # Assigned values for static IPs -# Container Registry -create_cr = false # Creation flag -cr_num_cpu = 4 # 4 CPUs -cr_memory = 8092 # 8 GB -cr_disk_size = 250 # 250 GB -cr_ip = "" # Assigned values for static IPs - # Postgres Servers postgres_servers = { default = { diff --git a/examples/vsphere/sample-terraform-vi.tfvars b/examples/vsphere/sample-terraform-vi.tfvars index ee4fb55..c26ee69 100644 --- a/examples/vsphere/sample-terraform-vi.tfvars +++ b/examples/vsphere/sample-terraform-vi.tfvars @@ -143,13 +143,6 @@ nfs_memory = 16384 # 16 GB nfs_disk_size = 500 # 500 GB nfs_ip = "" # Assigned values for static IPs -# Container Registry -create_cr = false # Creation flag -cr_num_cpu = 4 # 4 CPUs -cr_memory = 8092 # 8 GB -cr_disk_size = 250 # 250 GB -cr_ip = "" # Assigned values for static IPs - # Postgres Servers postgres_servers = { default = { diff --git a/variables.tf b/variables.tf index 12cea8c..e56957c 100644 --- a/variables.tf +++ b/variables.tf @@ -212,7 +212,7 @@ variable "nfs_disk_size" { default = 250 } -# container registry +# container registry - TODO variable "create_cr" { type = bool default = false