Merge branch 'master' of /git/ansible

This commit is contained in:
Rick Elrod 2017-01-03 17:24:09 +00:00
commit 159feac32a
2 changed files with 5 additions and 6 deletions

View file

@ -15,3 +15,8 @@ do
echo "Removing $line"
ipa selfservice-del "$line"
done
# Disable default permissions so we don't break our privacy policy
ipa permission-mod "System: Read User Addressbook Attributes" --bindtype=permission
# TODO: Add custom permissions to grant specific access to user attributes

View file

@ -36,12 +36,6 @@
- name: Generate configuration
template: src=config_server.ini.j2 dest=/etc/taskotron_base_images/config_server.ini owner=root group=root mode=0644
- name: Create cronjob to build new F23 images
cron:
name: "Build new f23 taskotron_cloud images in ImageFactory"
special_time: daily
job: '/var/lib/fedoraqa/base_images/trigger_build/trigger_build.py build --config /etc/taskotron_base_images/config_server.ini --release 23 --arch x86_64 --flavor="taskotron_cloud" --disksize="30G" > /dev/null'
- name: Create cronjob to build new F24 images
cron:
name: "Build new f24 taskotron_cloud images in ImageFactory"