resolved merge conflicts
Former-commit-id: 840ccd6e
No related branches found
No related tags found
Showing
- .gitlab-ci.yml 64 additions, 2 deletions.gitlab-ci.yml
- CICD/heat/gc_HOT.yaml 1 addition, 1 deletionCICD/heat/gc_HOT.yaml
- roles/cron-access/tasks/main.yml 8 additions, 0 deletionsroles/cron-access/tasks/main.yml
- roles/mysql/tasks/mysql_server.yml 8 additions, 0 deletionsroles/mysql/tasks/mysql_server.yml
- roles/set_timezone/README.md 13 additions, 0 deletionsroles/set_timezone/README.md
- roles/set_timezone/tasks/main.yml 20 additions, 0 deletionsroles/set_timezone/tasks/main.yml
- roles/set_timezone/templates/ntp.conf.j2 55 additions, 0 deletionsroles/set_timezone/templates/ntp.conf.j2
- roles/set_timezone/vars/main.yml 3 additions, 0 deletionsroles/set_timezone/vars/main.yml
- scripts/make_inventory.py 5 additions, 1 deletionscripts/make_inventory.py
roles/cron-access/tasks/main.yml
0 → 100644
roles/set_timezone/README.md
0 → 100644
roles/set_timezone/tasks/main.yml
0 → 100644
roles/set_timezone/templates/ntp.conf.j2
0 → 100644
roles/set_timezone/vars/main.yml
0 → 100644
Please register or sign in to comment