Merge branch 'develop' into neoloc/consul_services

Conflicts: hieradata/common.yaml site/profiles/manifests/consul/client.pp
2024-04-28 17:09:18 +10:00
parent 8df927de18 926ed24070
commit 587df5309f
2 changed files with 3 additions and 4 deletions
@@ -110,7 +110,6 @@ profiles::consul::client::node_rules:
    segment: ''
    disposition: read

-
 profiles::packages::install:
  - bash-completion
  - bzip2