Skip to content

Commit e94f09e

Browse files
committed
Vagrant refinements
1 parent 770854c commit e94f09e

File tree

2 files changed

+18
-21
lines changed

2 files changed

+18
-21
lines changed

hiera.yaml

Lines changed: 5 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,15 @@
1-
---
21
version: 5
3-
42
defaults:
5-
datadir: modules/hieradata/data # Data in separated module, defined in Puppetfile
6-
# datadir: hieradata # Data in control-repo. Previous psick setting
7-
# datadir: data # Data in control-repo. Default for puppetlabs/control-repo
8-
3+
datadir: modules/hieradata/data
94
hierarchy:
10-
# - name: "ServiceNow Hiera data"
11-
# data_hash: servicenow_cmdb_integration::getvar
12-
# options:
13-
# var: trusted.external.servicenow.hiera_data
14-
- name: "Eyaml hierarchy"
15-
lookup_key: eyaml_lookup_key # eyaml backend
5+
- name: Eyaml hierarchy
6+
lookup_key: eyaml_lookup_key
167
paths:
178
- "nodes/%{trusted.certname}.yaml"
189
- "role/%{::role}-%{::env}.yaml"
1910
- "role/%{::role}.yaml"
2011
- "zone/%{::zone}.yaml"
21-
- "common.yaml"
12+
- common.yaml
2213
options:
2314
pkcs7_private_key: /etc/puppetlabs/puppet/keys/private_key.pkcs7.pem
24-
pkcs7_public_key: /etc/puppetlabs/puppet/keys/public_key.pkcs7.pem
25-
# These Hiera eyaml keys are needed only when encrypted data is used.
26-
# If needed the above keys have to be placed on every node that compiles catalogs:
27-
# not only puppet servers, but also test servers, ci runners, local dev stations.
28-
# Use the hierarchy to override encrypted keys with dummy clear text values, in order
29-
# to limit the nodes where to copy keys.
15+
pkcs7_public_key: /etc/puppetlabs/puppet/keys/public_key.pkcs7.pem

vagrant/environments/lab/config.yaml

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,11 +102,22 @@ nodes:
102102
forwarded_port2:
103103
guest: 8443
104104
host: 1690
105-
- role: comply
105+
- role: foremanbare
106106
ip_address: 10.42.43.108
107107
memory: 16384
108108
cpu: 12
109+
box: almalinux8
110+
forwarded_port:
111+
guest: 443
112+
host: 2443
113+
- role: foremanbare2
114+
ip_address: 10.42.43.109
115+
memory: 16384
116+
cpu: 12
109117
box: rhel8
118+
forwarded_port:
119+
guest: 443
120+
host: 2444
110121
- role: git
111122
cpu: 2
112123
memory: 4096
@@ -156,7 +167,7 @@ nodes:
156167
host: 1442
157168
- role: lamp
158169
count: 1
159-
memory: 1024
170+
memory: 2048
160171
cpu: 1
161172
box: centos7
162173
forwarded_port:

0 commit comments

Comments
 (0)