diff --git a/roles/ubuntu-mirror/tasks/main.yml b/roles/ubuntu-mirror/tasks/main.yml index 001a992..3babb49 100644 --- a/roles/ubuntu-mirror/tasks/main.yml +++ b/roles/ubuntu-mirror/tasks/main.yml @@ -1,4 +1,9 @@ --- - include: ubuntu-mirror.yml - when: ansible_bios_version != "VirtualBox" + when: not use_local_mirror|bool tags: ubuntu-mirror + +- include: local-mirror.yml + when: use_local_mirror|bool + sudo: yes + tags: local-mirror diff --git a/run.sh b/run.sh index 1e788e2..42256eb 100755 --- a/run.sh +++ b/run.sh @@ -2,11 +2,15 @@ echo "Please review ansible hosts settings." sleep 2 -vim hosts +$EDITOR hosts echo "Please review settings for domain/server settings." sleep 2 -vim domain.yml +$EDITOR domain.yml + +echo "Please review mirror settings from mirror.yml." +sleep 2 +$EDITOR mirror.yml # Configure the server machine using Ansible tasks. ansible-playbook init.yml --ask-pass diff --git a/setup.yml b/setup.yml index ef8fe44..155793c 100644 --- a/setup.yml +++ b/setup.yml @@ -1,6 +1,8 @@ --- - hosts: server + vars_files: + - mirror.yml roles: - setup - nethcfg