Merge branch 'master' of github.com:monash-merc/ansible_cluster_in_a_box into mcc-nectar
Conflicts: roles/easy-rsa-CA-client/tasks/buildClientCert.yml roles/easy-rsa-CA-server/tasks/buildServerCert.yml
Showing
- roles/easy-rsa-CA/tasks/buildCA.yml 2 additions, 0 deletionsroles/easy-rsa-CA/tasks/buildCA.yml
- roles/easy-rsa-CA/tasks/buildClientCert.yml 0 additions, 11 deletionsroles/easy-rsa-CA/tasks/buildClientCert.yml
- roles/easy-rsa-CA/tasks/buildServerCert.yml 0 additions, 17 deletionsroles/easy-rsa-CA/tasks/buildServerCert.yml
- roles/easy-rsa-CA/tasks/copyConfigurationFile.yml 0 additions, 10 deletionsroles/easy-rsa-CA/tasks/copyConfigurationFile.yml
- roles/easy-rsa-CA/tasks/main.yml 0 additions, 4 deletionsroles/easy-rsa-CA/tasks/main.yml
- roles/easy-rsa-common/defaults/main.yml 8 additions, 0 deletionsroles/easy-rsa-common/defaults/main.yml
- roles/easy-rsa-common/files/defaultConfig 0 additions, 0 deletionsroles/easy-rsa-common/files/defaultConfig
- roles/easy-rsa-common/tasks/copyConfigurationFile.yml 12 additions, 0 deletionsroles/easy-rsa-common/tasks/copyConfigurationFile.yml
- roles/easy-rsa-common/tasks/installEasyRsa.yml 2 additions, 0 deletionsroles/easy-rsa-common/tasks/installEasyRsa.yml
- roles/easy-rsa-common/tasks/main.yml 6 additions, 0 deletionsroles/easy-rsa-common/tasks/main.yml
- roles/etcHosts/defaults/main.yml 4 additions, 0 deletionsroles/etcHosts/defaults/main.yml
- roles/etcHosts/tasks/main.yml 4 additions, 0 deletionsroles/etcHosts/tasks/main.yml
- roles/resolveHosts/meta/main.yml 0 additions, 5 deletionsroles/resolveHosts/meta/main.yml
- scripts/makehosts.py 5 additions, 5 deletionsscripts/makehosts.py
- templates/easy-rsa/vars.j2 6 additions, 6 deletionstemplates/easy-rsa/vars.j2
Loading
Please register or sign in to comment