diff options
| author |   Harry Huang <huangxiangyu5@huawei.com> | 2018-07-24 16:38:23 +0800 |
|---|---|---|
| committer | Harry Huang <huangxiangyu5@huawei.com> | 2018-07-24 16:38:23 +0800 |
| commit | c93bdd489e9f8270b69f19ee233ebd82aa708b80 (patch) | |
| tree | 6946d5765f91fa1d676db27eeb3a843cd0476fe6 | |
| parent | 27b030fb5cf3f779a5d3af2d9081dc22950f5233 (diff) | |
Modify download url for lxc image
JIRA: COMPASS-607
Download lxc image from a local server in huawei
lab to avoid lxc pre-staged failure.
Change-Id: Ia941d9e883ab5a4ff9c839e65e53703c6c237461
Signed-off-by: Harry Huang <huangxiangyu5@huawei.com>
| -rw-r--r-- | deploy/adapters/ansible/roles/config-osa/files/lxc_cache_prestage.patch | 11 | ||||
| -rwxr-xr-x | deploy/adapters/ansible/roles/config-osa/tasks/main.yml | 11 |
2 files changed, 22 insertions, 0 deletions
diff --git a/deploy/adapters/ansible/roles/config-osa/files/lxc_cache_prestage.patch b/deploy/adapters/ansible/roles/config-osa/files/lxc_cache_prestage.patch new file mode 100644 index 00000000..14f5f5f0 --- /dev/null +++ b/deploy/adapters/ansible/roles/config-osa/files/lxc_cache_prestage.patch @@ -0,0 +1,11 @@ +--- lxc_cache_prestage.yml 2018-07-24 07:56:22.480369360 +0000 ++++ /tmp/lxc_cache_prestage.yml 2018-07-24 08:17:44.665880308 +0000 +@@ -66,7 +66,7 @@ + --dir=/tmp + --out=rootfs.tar.xz + --check-certificate={{ (lxc_hosts_validate_certs | bool) | lower }} +- {% for server in lxc_image_cache_server_mirrors %}{{ server }}{{ lxc_images[0].split(';')[-1] }}rootfs.tar.xz {% endfor %} ++ http://192.168.137.222/download/rootfs.tar.xz + > /var/log/aria2c-image-prestage.log 2>&1 + args: + warn: no diff --git a/deploy/adapters/ansible/roles/config-osa/tasks/main.yml b/deploy/adapters/ansible/roles/config-osa/tasks/main.yml index eca7ca56..3fd04dcb 100755 --- a/deploy/adapters/ansible/roles/config-osa/tasks/main.yml +++ b/deploy/adapters/ansible/roles/config-osa/tasks/main.yml @@ -368,3 +368,14 @@ dest: /etc/ansible/roles/lxc_hosts/tasks/lxc_cache_preparation_systemd_new.yml regexp: '^ retries: 60' replace: ' retries: 120' + +- name: copy lxc_cache_prestage.patch + copy: + src: lxc_cache_prestage.patch + dest: /etc/ansible/roles/lxc_hosts/tasks/lxc_cache_prestage.patch + +- name: patch lxc_cache_prestage.yml + shell: + patch -p0 < lxc_cache_prestage.patch + args: + chdir: /etc/ansible/roles/lxc_hosts/tasks/ |