Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Open sidebar
gitlab-com
gitlab-com-infrastructure
Commits
ff47ee0a
Commit
ff47ee0a
authored
Apr 19, 2018
by
John Jarvis
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Jarv/add dedicated console vm
parent
7412b58c
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
30 additions
and
0 deletions
+30
-0
environments/gprd/main.tf
environments/gprd/main.tf
+26
-0
environments/gprd/variables.tf
environments/gprd/variables.tf
+4
-0
No files found.
environments/gprd/main.tf
View file @
ff47ee0a
...
...
@@ -844,6 +844,32 @@ module "alerts" {
health_check
=
"tcp"
}
##################################
#
# Console
#
##################################
module
"console"
{
bootstrap_version
=
3
chef_provision
=
"
${
var
.
chef_provision
}
"
chef_run_list
=
"
\"
role[
${
var
.
environment
}
-base-console-node]
\"
"
dns_zone_name
=
"
${
var
.
dns_zone_name
}
"
environment
=
"
${
var
.
environment
}
"
ip_cidr_range
=
"
${
var
.
subnetworks
[
"console"
]
}
"
machine_type
=
"
${
var
.
machine_types
[
"console"
]
}
"
name
=
"console"
node_count
=
"
${
var
.
node_count
[
"console"
]
}
"
project
=
"
${
var
.
project
}
"
public_ports
=
"
${
var
.
public_ports
[
"console"
]
}
"
region
=
"
${
var
.
region
}
"
source
=
"../../modules/google/generic-sv-with-group"
health_check
=
"tcp"
service_port
=
22
tier
=
"sv"
vpc
=
"
${module
.
network
.
self_link
}
"
}
##################################
#
# Deploy
...
...
environments/gprd/variables.tf
View file @
ff47ee0a
...
...
@@ -112,6 +112,7 @@ variable "public_ports" {
"api"
=
[
22
]
"bastion"
=
[
22
]
"consul"
=
[
22
]
"console"
=
[
22
]
"deploy"
=
[
22
]
"runner"
=
[
22
]
"db"
=
[
22
]
...
...
@@ -174,6 +175,7 @@ variable "machine_types" {
"bastion"
=
"g1-small"
"consul"
=
"n1-standard-4"
"db"
=
"n1-highmem-32"
"console"
=
"n1-standard-1"
"deploy"
=
"n1-standard-2"
"fe-lb"
=
"n1-standard-4"
"geodb"
=
"n1-highmem-32"
...
...
@@ -206,6 +208,7 @@ variable "node_count" {
"api"
=
2
"artifacts"
=
1
"bastion"
=
3
"console"
=
1
"consul"
=
3
"db"
=
3
"deploy"
=
1
...
...
@@ -253,6 +256,7 @@ variable "subnetworks" {
"consul"
=
"10.218.1.0/24"
"deploy"
=
"10.218.3.0/24"
"runner"
=
"10.218.4.0/24"
"console"
=
"10.218.5.0/24"
"monitoring"
=
"10.219.1.0/24"
"registry"
=
"10.220.10.0/23"
"mailroom"
=
"10.220.14.0/23"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment