Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions puppet-master/Puppetconf.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ puppet-master:
memory: 1024
cpu: 1
# gitcode_path will be mounted on this environment in: /etc/puppetlabs/code/environments/$ENVIRONMENT
#puppet_environment: "production"
puppet_environment: "IT_992_mareuter"
# If you want to work on your own puppet code, we recommend adding this variable with the path in where the puppet code is
#gitcode_path: "../../itconf_l1ts/"

gitcode_path: "../../itconf_l1ts/"
2 changes: 0 additions & 2 deletions puppet-master/hiera/dev/vm/dm/vm/hs/hs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@ dm::dm_header_service::ts_xml_languages:
- "cpp"
- "python"

ts_sal::sal_network_interface: "eth1"

monitoring_enabled: false

firewalld_status: "stopped"
Expand Down
2 changes: 1 addition & 1 deletion puppet-master/hiera/dev/vm/vm.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,4 +37,4 @@ ts_sal::sal_pwd: "$1$LSST$HYme564rL6LjMkjrDNGUb0"
ts_sal::salmgr_pwd: "$1$LSST$HYme564rL6LjMkjrDNGUb0"

#Make sure SAL uses the desired network interface
ts_sal::sal_network_interface: "eth1"
ts_sal::sal_network_interface: "eth1"