Skip to content

Commit 8b9aaa2

Browse files
committed
working test
1 parent 4eab4e0 commit 8b9aaa2

File tree

6 files changed

+49
-43
lines changed

6 files changed

+49
-43
lines changed

main.tf

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,15 @@ module "primarycluster" {
3737
cidr_blocks = "${var.cidr_blocks}"
3838
instance_type_server= "${var.instance_type_server}"
3939
instance_type_worker= "${var.instance_type_worker}"
40-
ca_key_algorithm = "${module.rootcertificate.ca_key_algorithm}"
40+
// ca_key_algorithm = "${var.ca_key_algorithm}"
41+
// ca_private_key_pem = "${var.ca_private_key_pem}"
42+
// ca_cert_pem = "${var.ca_cert_pem}"
43+
ca_key_algorithm = "${module.rootcertificate.ca_key_algorithm}"
4144
ca_private_key_pem = "${module.rootcertificate.ca_private_key_pem}"
4245
ca_cert_pem = "${module.rootcertificate.ca_cert_pem}"
4346
}
4447

45-
48+
/*
4649
module "secondarycluster" {
4750
source = "./modules"
4851
owner = "${var.owner}"
@@ -76,10 +79,14 @@ module "secondarycluster" {
7679
cidr_blocks = "${var.cidr_blocks}"
7780
instance_type_server= "${var.instance_type_server}"
7881
instance_type_worker= "${var.instance_type_worker}"
79-
ca_key_algorithm = "${module.rootcertificate.ca_key_algorithm}"
82+
// ca_key_algorithm = "${var.ca_key_algorithm}"
83+
// ca_private_key_pem = "${var.ca_private_key_pem}"
84+
// ca_cert_pem = "${var.ca_cert_pem}"
85+
ca_key_algorithm = "${module.rootcertificate.ca_key_algorithm}"
8086
ca_private_key_pem = "${module.rootcertificate.ca_private_key_pem}"
8187
ca_cert_pem = "${module.rootcertificate.ca_cert_pem}"
8288
}
89+
*/
8390

8491
module "rootcertificate" {
8592
source = "github.com/GuyBarros/terraform-tls-certificate"
@@ -91,3 +98,4 @@ module "rootcertificate" {
9198
validity_period_hours = 720
9299
is_ca_certificate = true
93100
}
101+

modules/certificates/main.tf

Lines changed: 0 additions & 25 deletions
This file was deleted.

modules/outputs.tf

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
output "consul_servers" {
2-
value = ["${aws_instance.server.*.public_dns}"]
1+
output "ssh_for_servers" {
2+
value = "${formatlist("ssh -i /Users/guy/.ssh/id_rsa ubuntu@%s", aws_instance.server.*.public_dns,)}"
33
}
44

5-
output "nomad_workers_server" {
6-
value = ["${aws_instance.workers.*.public_dns}"]
5+
output "ssh_for_workers" {
6+
value = "${formatlist("ssh demo@%s", aws_instance.workers.*.public_dns,)}"
77
}
88

99
output "nomad_workers_consul_ui" {

modules/templates/server/vault.sh

Lines changed: 23 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -301,7 +301,28 @@ EOR
301301
explicit_max_ttl=0
302302

303303
echo "--> Creating Initial secret for Nomad KV"
304-
vault write secret/test message='Hi Mom'
305-
304+
vault write secret/test message='Hello world'
305+
306+
echo "--> nomad nginx-vault-pki demo prep"
307+
{
308+
vault secrets enable pki &&
309+
310+
vault write pki/root/generate/internal common_name=service.consul &&
306311

312+
vault write pki/roles/consul-service generate_lease=true allowed_domains="service.consul" allow_subdomains="true" &&
313+
314+
vault write pki/issue/consul-service common_name=nginx.service.consul ttl=72h &&
315+
316+
vault policy-write superuser - <<EOR
317+
path "*" {
318+
capabilities = ["create", "read", "update", "delete", "list", "sudo"]
319+
}
320+
321+
EOR
322+
323+
} ||
324+
{
325+
echo "--> pki demo already configured, moving on"
326+
}
327+
307328
echo "==> Vault is done!"

modules/templates/workers/connectdemo.sh

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,11 @@ echo "==> Consul Connect Demo Setup"
55

66

77
echo "--> Running MongoDB Nomad Job"
8-
9-
nomad run /demostack/nomad_jobs/nginx-kv-secret.nomad
10-
nomad run /demostack/nomad_jobs/mongodb.nomad
8+
nomad run /demostack/nomad_jobs/nginx-pki.nomad
119
nomad run /demostack/nomad_jobs/hashibo.nomad
1210
nomad run /demostack/nomad_jobs/orchestrators.nomad
1311

12+
1413
echo "==> Consul Connect Demo Setup is Done!"
1514

1615

outputs.tf

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,13 @@
11
// Primary
2-
output "primary_nomad_workers_server" {
3-
value = ["${module.primarycluster.nomad_workers_server}"]
2+
output "primary_ssh_for_servers" {
3+
value = ["${module.primarycluster.ssh_for_servers}"]
44
}
55

6+
output "primary_ssh_for_workers" {
7+
value = ["${module.primarycluster.ssh_for_workers}"]
8+
}
9+
10+
611
output "primary_nomad_workers_consul_ui" {
712
value = ["${module.primarycluster.nomad_workers_consul_ui}"]
813
}
@@ -11,9 +16,6 @@ output "primary_nomad_workers_ui" {
1116
value = ["${module.primarycluster.nomad_workers_ui}"]
1217
}
1318

14-
output "primary_consul_servers" {
15-
value = "${module.primarycluster.consul_servers}"
16-
}
1719

1820
output "primary_vpc_id" {
1921
value = "${module.primarycluster.vpc_id}"
@@ -33,7 +35,7 @@ output "primary_vault_ui" {
3335

3436

3537
// Secondary
36-
38+
/*
3739
output "secondary_nomad_workers_server" {
3840
value = ["${module.secondarycluster.nomad_workers_server}"]
3941
}
@@ -65,6 +67,7 @@ output "secondary_vault_lb" {
6567
output "secondary_vault_ui" {
6668
value = "${module.secondarycluster.vault_ui}"
6769
}
70+
*/
6871

6972

7073

0 commit comments

Comments
 (0)