WIP

hashicorp-forge · May 23, 2024 · 4bf3678 · 4bf3678
1 parent 0ec2eca
commit 4bf3678
Show file tree

Hide file tree

Showing 35 changed files with 30 additions and 3 deletions.
diff --git a/ansible.cfg b/ansible.cfg
diff --git a/shared/ansible/galaxy.yaml → .../ansible/hashicorp/nomad_bench/galaxy.yml b/shared/ansible/galaxy.yaml → .../ansible/hashicorp/nomad_bench/galaxy.yml
@@ -1,7 +1,7 @@
 namespace: "hashicorp"
 name: "nomad_bench"
 version: "0.0.1"
-readme: "README.md"
+readme: "../../README.md"
 authors:
   - "HashiCorp"
 description: "Nomad Bench Ansible Collection"

diff --git a/shared/ansible/hashicorp/nomad_bench/requirements.txt b/shared/ansible/hashicorp/nomad_bench/requirements.txt
@@ -0,0 +1,11 @@
+ansible==9.2.0
+ansible-core==2.16.3
+cffi==1.16.0
+cryptography==42.0.2
+Jinja2==3.1.3
+jmespath==1.0.1
+MarkupSafe==2.1.4
+packaging==23.2
+pycparser==2.21
+PyYAML==6.0.1
+resolvelib==1.0.1
diff --git a/shared/ansible/hashicorp/nomad_bench/requirements.yaml b/shared/ansible/hashicorp/nomad_bench/requirements.yaml
@@ -0,0 +1,12 @@
+# Copyright (c) HashiCorp, Inc.
+# SPDX-License-Identifier: MPL-2.0
+
+roles:
+  - src: "geerlingguy.docker"
+    version: "7.1.0"
+  - src: "gantsign.golang"
+    version: "3.2.4"
+
+collections:
+  - name: "cloud.terraform"
+    version: "2.0.0"
diff --git a/shared/ansible/roles/.gitignore → ...le/hashicorp/nomad_bench/roles/.gitignore b/shared/ansible/roles/.gitignore → ...le/hashicorp/nomad_bench/roles/.gitignore
diff --git a/...ed/ansible/roles/build/defaults/main.yaml → ...omad_bench/roles/build/defaults/main.yaml b/...ed/ansible/roles/build/defaults/main.yaml → ...omad_bench/roles/build/defaults/main.yaml
diff --git a/shared/ansible/roles/build/tasks/main.yaml → ...p/nomad_bench/roles/build/tasks/main.yaml b/shared/ansible/roles/build/tasks/main.yaml → ...p/nomad_bench/roles/build/tasks/main.yaml
diff --git a/shared/ansible/roles/cni/defaults/main.yaml → .../nomad_bench/roles/cni/defaults/main.yaml b/shared/ansible/roles/cni/defaults/main.yaml → .../nomad_bench/roles/cni/defaults/main.yaml
diff --git a/shared/ansible/roles/cni/tasks/install.yaml → .../nomad_bench/roles/cni/tasks/install.yaml b/shared/ansible/roles/cni/tasks/install.yaml → .../nomad_bench/roles/cni/tasks/install.yaml
diff --git a/shared/ansible/roles/cni/tasks/main.yaml → ...orp/nomad_bench/roles/cni/tasks/main.yaml b/shared/ansible/roles/cni/tasks/main.yaml → ...orp/nomad_bench/roles/cni/tasks/main.yaml
diff --git a/shared/ansible/roles/common/tasks/main.yaml → .../nomad_bench/roles/common/tasks/main.yaml b/shared/ansible/roles/common/tasks/main.yaml → .../nomad_bench/roles/common/tasks/main.yaml
diff --git a/...oles/influxdb_telegraf/defaults/main.yaml → ...oles/influxdb_telegraf/defaults/main.yaml b/...oles/influxdb_telegraf/defaults/main.yaml → ...oles/influxdb_telegraf/defaults/main.yaml
diff --git a/...oles/influxdb_telegraf/handlers/main.yaml → ...oles/influxdb_telegraf/handlers/main.yaml b/...oles/influxdb_telegraf/handlers/main.yaml → ...oles/influxdb_telegraf/handlers/main.yaml
diff --git a/...e/roles/influxdb_telegraf/tasks/main.yaml → ...h/roles/influxdb_telegraf/tasks/main.yaml b/...e/roles/influxdb_telegraf/tasks/main.yaml → ...h/roles/influxdb_telegraf/tasks/main.yaml
diff --git a/.../influxdb_telegraf/templates/base.conf.j2 → .../influxdb_telegraf/templates/base.conf.j2 b/.../influxdb_telegraf/templates/base.conf.j2 → .../influxdb_telegraf/templates/base.conf.j2
diff --git a/...af/templates/influxdb_telegraf.service.j2 → ...af/templates/influxdb_telegraf.service.j2 b/...af/templates/influxdb_telegraf.service.j2 → ...af/templates/influxdb_telegraf.service.j2
diff --git a/...ed/ansible/roles/nomad/defaults/main.yaml → ...omad_bench/roles/nomad/defaults/main.yaml b/...ed/ansible/roles/nomad/defaults/main.yaml → ...omad_bench/roles/nomad/defaults/main.yaml
diff --git a/...le/roles/nomad/files/anonymous.policy.hcl → ...ch/roles/nomad/files/anonymous.policy.hcl b/...le/roles/nomad/files/anonymous.policy.hcl → ...ch/roles/nomad/files/anonymous.policy.hcl
diff --git a/...ed/ansible/roles/nomad/handlers/main.yaml → ...omad_bench/roles/nomad/handlers/main.yaml b/...ed/ansible/roles/nomad/handlers/main.yaml → ...omad_bench/roles/nomad/handlers/main.yaml
diff --git a/...ible/roles/nomad/tasks/acl_bootstrap.yaml → ...ench/roles/nomad/tasks/acl_bootstrap.yaml b/...ible/roles/nomad/tasks/acl_bootstrap.yaml → ...ench/roles/nomad/tasks/acl_bootstrap.yaml
diff --git a/...nsible/roles/nomad/tasks/host_volume.yaml → ..._bench/roles/nomad/tasks/host_volume.yaml b/...nsible/roles/nomad/tasks/host_volume.yaml → ..._bench/roles/nomad/tasks/host_volume.yaml
diff --git a/shared/ansible/roles/nomad/tasks/main.yaml → ...p/nomad_bench/roles/nomad/tasks/main.yaml b/shared/ansible/roles/nomad/tasks/main.yaml → ...p/nomad_bench/roles/nomad/tasks/main.yaml
diff --git a/shared/ansible/roles/nomad/tasks/tls.yaml → ...rp/nomad_bench/roles/nomad/tasks/tls.yaml b/shared/ansible/roles/nomad/tasks/tls.yaml → ...rp/nomad_bench/roles/nomad/tasks/tls.yaml
diff --git a/...ansible/roles/nomad/templates/base.hcl.j2 → ...d_bench/roles/nomad/templates/base.hcl.j2 b/...ansible/roles/nomad/templates/base.hcl.j2 → ...d_bench/roles/nomad/templates/base.hcl.j2
diff --git a/...sible/roles/nomad/templates/client.hcl.j2 → ...bench/roles/nomad/templates/client.hcl.j2 b/...sible/roles/nomad/templates/client.hcl.j2 → ...bench/roles/nomad/templates/client.hcl.j2
diff --git a/.../roles/nomad/templates/host-volume.hcl.j2 → .../roles/nomad/templates/host-volume.hcl.j2 b/.../roles/nomad/templates/host-volume.hcl.j2 → .../roles/nomad/templates/host-volume.hcl.j2
diff --git a/...roles/nomad/templates/nomad_profile.sh.j2 → ...roles/nomad/templates/nomad_profile.sh.j2 b/...roles/nomad/templates/nomad_profile.sh.j2 → ...roles/nomad/templates/nomad_profile.sh.j2
diff --git a/...sible/roles/nomad/templates/server.hcl.j2 → ...bench/roles/nomad/templates/server.hcl.j2 b/...sible/roles/nomad/templates/server.hcl.j2 → ...bench/roles/nomad/templates/server.hcl.j2
diff --git a/.../ansible/roles/nomad/templates/tls.hcl.j2 → ...ad_bench/roles/nomad/templates/tls.hcl.j2 b/.../ansible/roles/nomad/templates/tls.hcl.j2 → ...ad_bench/roles/nomad/templates/tls.hcl.j2
diff --git a/...ansible/roles/nomad_lb/defaults/main.yaml → ...d_bench/roles/nomad_lb/defaults/main.yaml b/...ansible/roles/nomad_lb/defaults/main.yaml → ...d_bench/roles/nomad_lb/defaults/main.yaml
diff --git a/...ansible/roles/nomad_lb/handlers/main.yaml → ...d_bench/roles/nomad_lb/handlers/main.yaml b/...ansible/roles/nomad_lb/handlers/main.yaml → ...d_bench/roles/nomad_lb/handlers/main.yaml
diff --git a/...ed/ansible/roles/nomad_lb/tasks/main.yaml → ...omad_bench/roles/nomad_lb/tasks/main.yaml b/...ed/ansible/roles/nomad_lb/tasks/main.yaml → ...omad_bench/roles/nomad_lb/tasks/main.yaml
diff --git a/...le/roles/nomad_lb/templates/nginx.conf.j2 → ...ch/roles/nomad_lb/templates/nginx.conf.j2 b/...le/roles/nomad_lb/templates/nginx.conf.j2 → ...ch/roles/nomad_lb/templates/nginx.conf.j2
diff --git a/shared/ansible/requirements.yaml b/shared/ansible/requirements.yaml
@@ -10,3 +10,6 @@ roles:
 collections:
   - name: "cloud.terraform"
     version: "2.0.0"
+  - name: "hashicorp.nomad_bench"
+    source: "shared/ansible/hashicorp/nomad_bench"
+    type: "dir"
diff --git a/tools/nomad-metrics/go.sum b/tools/nomad-metrics/go.sum
@@ -61,6 +61,7 @@ github.com/hashicorp/go-rootcerts v1.0.2 h1:jzhAVGtqPKbwpyCPELlgNWhE1znq+qwJtW5O
 github.com/hashicorp/go-rootcerts v1.0.2/go.mod h1:pqUvnprVnM5bf7AOirdbb01K4ccR319Vf4pU3K5EGc8=
 github.com/hashicorp/nomad v1.7.3 h1:iNZFZaSi+kcnm4+Po/mrn1GKJ2spDJehgtLpvADYHlk=
 github.com/hashicorp/nomad v1.7.3/go.mod h1:SBmk/k507T3B65May9GTLJwybafDTUSdpxX+jJvumSc=
+github.com/hashicorp/nomad v1.7.6/go.mod h1:/YARRc4nd7N+BoxjLuZi41ijIc8beJA9ybcSbmeWjZo=
 github.com/hashicorp/nomad/api v0.0.0-20240116172050-bc039a7a8a22 h1:q3cE4vcE/i8DXNlKikFCxg/SkBF5Z4+gFMXgr6puVtY=
 github.com/hashicorp/nomad/api v0.0.0-20240116172050-bc039a7a8a22/go.mod h1:ijDwa6o1uG1jFSq6kERiX2PamKGpZzTmo0XOFNeFZgw=
 github.com/huandu/xstrings v1.3.1/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE=
@@ -157,6 +158,7 @@ golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5y
 golang.org/x/crypto v0.3.0/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4=
 golang.org/x/crypto v0.17.0 h1:r8bRNjWL3GshPW3gkd+RpvzWrZAwPS49OmTGZ/uhM4k=
 golang.org/x/crypto v0.17.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4=
+golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU=
 golang.org/x/exp v0.0.0-20231006140011-7918f672742d h1:jtJma62tbqLibJ5sFQz8bKtEM8rJBtfilJ2qTU199MI=
 golang.org/x/exp v0.0.0-20231006140011-7918f672742d/go.mod h1:ldy0pHrwJyGW56pPQzzkH36rKxoZW1tw7ZJpeKx+hdo=
 golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
@@ -187,6 +189,7 @@ golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc=
 golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=