Merge branch 'newinfra' into 'nano'
# Conflicts: # roles/root-config/templates/nanorc.j2
Showing
- base.yml 31 additions, 43 deletionsbase.yml
- group_vars/all/vars.yaml 35 additions, 24 deletionsgroup_vars/all/vars.yaml
- group_vars/crans_server/vars.yml 9 additions, 0 deletionsgroup_vars/crans_server/vars.yml
- group_vars/dhcp.yml 17 additions, 71 deletionsgroup_vars/dhcp.yml
- group_vars/keepalived.yml 14 additions, 50 deletionsgroup_vars/keepalived.yml
- group_vars/slapd.yml 6 additions, 0 deletionsgroup_vars/slapd.yml
- host_vars/bakdaur.adm.crans.org.yml 6 additions, 5 deletionshost_vars/bakdaur.adm.crans.org.yml
- host_vars/daniel.adm.crans.org.yml 5 additions, 0 deletionshost_vars/daniel.adm.crans.org.yml
- host_vars/eap.adm.crans.org.yml 6 additions, 5 deletionshost_vars/eap.adm.crans.org.yml
- host_vars/frontdaur.adm.crans.org.yml 6 additions, 5 deletionshost_vars/frontdaur.adm.crans.org.yml
- host_vars/gulp.adm.crans.org.yml 6 additions, 5 deletionshost_vars/gulp.adm.crans.org.yml
- host_vars/jack.adm.crans.org.yml 5 additions, 0 deletionshost_vars/jack.adm.crans.org.yml
- host_vars/odlyd.adm.crans.org.yml 10 additions, 9 deletionshost_vars/odlyd.adm.crans.org.yml
- host_vars/radius.adm.crans.org.yml 6 additions, 5 deletionshost_vars/radius.adm.crans.org.yml
- host_vars/routeur-daniel.adm.crans.org.yml 16 additions, 0 deletionshost_vars/routeur-daniel.adm.crans.org.yml
- host_vars/routeur-sam.adm.crans.org.yml 16 additions, 0 deletionshost_vars/routeur-sam.adm.crans.org.yml
- host_vars/sam.adm.crans.org.yml 5 additions, 0 deletionshost_vars/sam.adm.crans.org.yml
- hosts 49 additions, 194 deletionshosts
- ldap.yml 5 additions, 0 deletionsldap.yml
- plays/keepalived.yml 2 additions, 0 deletionsplays/keepalived.yml
Loading
Please register or sign in to comment