Remove old tasks and vars from image download process
These are leftover from when the role downloaded prebuilt LXC iamges, but are no longer used. Change-Id: I3689e18cbd62804d7a959beb8f58f91920beecd1
This commit is contained in:
parent
655818e0a0
commit
a22ec2150f
@ -172,15 +172,6 @@ lxc_cache_prep_dns:
|
|||||||
lxc_cache_prep_pre_commands: '## pre command skipped ##'
|
lxc_cache_prep_pre_commands: '## pre command skipped ##'
|
||||||
lxc_cache_prep_post_commands: '## post command skipped ##'
|
lxc_cache_prep_post_commands: '## post command skipped ##'
|
||||||
|
|
||||||
# User defined variable pointing to a specific variable file used when setting
|
|
||||||
# up the base container image. Deployers can use the provided container variable
|
|
||||||
# files by simply inputting the file name
|
|
||||||
# "{{ ansible_facts['distribution'] }}-{{ ansible_facts['distribution_version'] }}-container.yml"
|
|
||||||
# or by providing the full path to a local file containing all of the variables
|
|
||||||
# needed to prepare a container. built-in supported values are:
|
|
||||||
# [redhat-7.yml, ubuntu-16.04.yml, ubuntu-18.04.yml]
|
|
||||||
# lxc_user_defined_container: null
|
|
||||||
|
|
||||||
# Full path to the base image prep script. By default this will use the
|
# Full path to the base image prep script. By default this will use the
|
||||||
# named script for a given OS within the "templates/prep-scripts" directory.
|
# named script for a given OS within the "templates/prep-scripts" directory.
|
||||||
# If a deployer wishes to override this script with something else they can
|
# If a deployer wishes to override this script with something else they can
|
||||||
|
@ -55,25 +55,6 @@
|
|||||||
mode: "0755"
|
mode: "0755"
|
||||||
register: create_new_dir
|
register: create_new_dir
|
||||||
|
|
||||||
- name: Tasks for image download
|
|
||||||
when:
|
|
||||||
- lxc_hosts_container_build_command | length == 0
|
|
||||||
block:
|
|
||||||
- name: Wait for base image download
|
|
||||||
async_status:
|
|
||||||
jid: "{{ prestage_image.ansible_job_id }}"
|
|
||||||
register: _lxc_prestage_image_result
|
|
||||||
until: _lxc_prestage_image_result.finished
|
|
||||||
delay: 5
|
|
||||||
retries: "{{ lxc_cache_prep_timeout | int // 5 }}"
|
|
||||||
|
|
||||||
- name: Unpack base image
|
|
||||||
unarchive:
|
|
||||||
src: "/tmp/{{ cache_basename }}"
|
|
||||||
dest: "/var/lib/machines/{{ lxc_container_base_name }}"
|
|
||||||
remote_src: yes
|
|
||||||
when: create_new_dir is changed
|
|
||||||
|
|
||||||
- name: Build the base image using a CLI tool
|
- name: Build the base image using a CLI tool
|
||||||
command: "{{ lxc_hosts_container_build_command }}"
|
command: "{{ lxc_hosts_container_build_command }}"
|
||||||
when: lxc_hosts_container_build_command | length > 0
|
when: lxc_hosts_container_build_command | length > 0
|
||||||
|
Loading…
Reference in New Issue
Block a user