geteduroam/geteduroam-ops
3
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Simplify stuff

Browse source
This commit is contained in:
Johan Wassberg 2024-09-23 09:42:23 +02:00
parent abcad08604
commit 895f595975
Signed by: jocar
GPG key ID: BE4EC2EEADF2C31B
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
global/overlay/etc/puppet/cosmos-rules.yaml
View file

@ -42,13 +42,13 @@ internal-sto1-test-db-1.geteduroam.sunet.se:
sunet::fleetlock_client: sunet::fleetlock_client:
sunet::dockerhost2: sunet::dockerhost2:
nat: false nat: false
geteduroam::db: sunet::mariadb::simple:
internal-dco-test-db-2.geteduroam.sunet.se: internal-dco-test-db-2.geteduroam.sunet.se:
sunet::fleetlock_client: sunet::fleetlock_client:
sunet::dockerhost2: sunet::dockerhost2:
nat: false nat: false
geteduroam::db: sunet::mariadb::simple:
internal-sto3-test-db-3.geteduroam.sunet.se: internal-sto3-test-db-3.geteduroam.sunet.se:
sunet::fleetlock_client: sunet::fleetlock_client:

6
global/overlay/etc/puppet/setup_cosmos_modules
View file

@ -115,9 +115,9 @@ def main():
if OS_INFO["VERSION_CODENAME"] == "bullseye": if OS_INFO["VERSION_CODENAME"] == "bullseye":
pass pass
if host_info: #if host_info:
if "internal-sto3-test-db-3.geteduroam.sunet.se" in host_info["fqdn"]: #if "internal-sto3-test-db-3.geteduroam.sunet.se" in host_info["fqdn"]:
modules["sunet"]["tag"] = "jocar-mariadb-simple*" # modules["sunet"]["tag"] = "jocar-mariadb-simple*"
# Build list of expected file content # Build list of expected file content
file_lines = create_file_content(modules) file_lines = create_file_content(modules)