9 Commits

Author SHA1 Message Date
unkinben 92fb0ee8c3 chore: re-organise puppet, puppetdb and puppetboard roles 2023-11-18 18:42:37 +11:00
Ben Vincent d9374f27f8 Merge pull request 'chore: update bind masters role' (#27) from neoloc/update_master_roles_bind into master
Reviewed-on: #27
2023-11-13 20:28:50 +09:30
unkinben 0051b97621 chore: update bind masters role 2023-11-13 21:58:10 +11:00
Ben Vincent 9d0aac7423 Merge pull request 'chore: add bind bind servers' (#26) from neoloc/bind_servers into master
Reviewed-on: #26
2023-11-12 13:09:32 +09:30
unkinben 2d8ec40625 chore: add bind bind servers
- update role for two existing hosts
- add new hosts/roles for authoritive dns roles
2023-11-12 14:38:17 +11:00
unkinben 5ebe7f564f Merge pull request 'chore: change ntpserver class' (#25) from neoloc/ntpservers into master
Reviewed-on: #25
2023-11-10 22:48:38 +09:30
unkinben e4dac0b21f chore: change ntpserver class 2023-11-10 23:32:32 +11:00
Ben Vincent e80706d3db Merge pull request 'fix: enc outputs *id001 in class/environment' (#24) from neoloc/enc_script_id001 into master
Reviewed-on: #24
2023-11-05 16:22:59 +09:30
unkinben 814b4e59b4 fix: enc outputs *id001 in class/environment
- the slice notation [:] creates a shallow copy of the list
- when dumping the data, it will not use the anchors and aliases because it
treats the values in enc_role and classes as separate lists
2023-11-05 17:51:28 +11:00
11 changed files with 18 additions and 10 deletions
+1 -1
View File
@@ -1,4 +1,4 @@
--- ---
classes: classes:
- roles::puppet::puppetmaster - roles::infra::puppet::master
environment: testing environment: testing
+1 -1
View File
@@ -1,4 +1,4 @@
--- ---
classes: classes:
- roles::puppet::puppetdb_api - roles::infra::puppetdb::api
environment: testing environment: testing
+1 -1
View File
@@ -1,4 +1,4 @@
--- ---
classes: classes:
- roles::puppet::puppetdb_sql - roles::infra::puppetdb::sql
environment: testing environment: testing
+1 -1
View File
@@ -1,4 +1,4 @@
--- ---
classes: classes:
- roles::puppet::puppetboard - roles::infra::puppetboard::server
environment: testing environment: testing
+1 -1
View File
@@ -1,4 +1,4 @@
--- ---
classes: classes:
- roles::base - roles::infra::dns::resolver
environment: testing environment: testing
+1 -1
View File
@@ -1,4 +1,4 @@
--- ---
classes: classes:
- roles::base - roles::infra::dns::resolver
environment: testing environment: testing
+1 -1
View File
@@ -1,4 +1,4 @@
--- ---
classes: classes:
- roles::base - roles::infra::ntpserver
environment: testing environment: testing
+1 -1
View File
@@ -1,4 +1,4 @@
--- ---
classes: classes:
- roles::base - roles::infra::ntpserver
environment: testing environment: testing
+4
View File
@@ -0,0 +1,4 @@
---
classes:
- roles::infra::dns::master
environment: testing
+4
View File
@@ -0,0 +1,4 @@
---
classes:
- roles::infra::dns::master
environment: testing
+2 -2
View File
@@ -34,11 +34,11 @@ def main():
# Add 'enc_role' parameter with classes data # Add 'enc_role' parameter with classes data
if "classes" in data: if "classes" in data:
data["parameters"]["enc_role"] = data["classes"] data["parameters"]["enc_role"] = data["classes"][:]
# Copy the environment to the parameters, if it exists # Copy the environment to the parameters, if it exists
if data.get("environment"): if data.get("environment"):
data["parameters"]["enc_env"] = data["environment"] data["parameters"]["enc_env"] = data["environment"][:]
# If the environment is 'testing', remove it # If the environment is 'testing', remove it
if data.get("environment") == "testing": if data.get("environment") == "testing":