summaryrefslogtreecommitdiffstats
path: root/xci/installer
diff options
context:
space:
mode:
authorMarkos Chandras <mchandras@suse.de>2018-09-06 07:10:09 +0000
committerGerrit Code Review <gerrit@opnfv.org>2018-09-06 07:10:09 +0000
commit9bc4e51f59af4e6ab65e6e039a84e818fafb4aa0 (patch)
tree35370243828e3f2c19e1f31e015e9cdf324e86a1 /xci/installer
parentafc3c2a4cb16b7fd29c1ceec6c4b7f566767dc6b (diff)
parented993a6fec64934283984c08bd4e99e8d9298d9c (diff)
Merge "playbooks: configure-opnfvhost: Ensure we copy only the tracked files"
Diffstat (limited to 'xci/installer')
-rw-r--r--xci/installer/kubespray/playbooks/configure-opnfvhost.yml19
-rw-r--r--xci/installer/osa/playbooks/configure-opnfvhost.yml19
2 files changed, 36 insertions, 2 deletions
diff --git a/xci/installer/kubespray/playbooks/configure-opnfvhost.yml b/xci/installer/kubespray/playbooks/configure-opnfvhost.yml
index 00a8053f..11866bd3 100644
--- a/xci/installer/kubespray/playbooks/configure-opnfvhost.yml
+++ b/xci/installer/kubespray/playbooks/configure-opnfvhost.yml
@@ -28,12 +28,29 @@
configure_network: xci_flavor != 'aio'
tasks:
+ - name: Create list of files to copy
+ shell: |
+ git ls-tree -r --name-only HEAD > {{ xci_cache }}/releng-xci.files
+ echo ".git/" >> {{ xci_cache }}/releng-xci.files
+ echo ".cache/repos/" >> {{ xci_cache }}/releng-xci.files
+ echo ".cache/xci.env" >> {{ xci_cache }}/releng-xci.files
+ args:
+ executable: /bin/bash
+ chdir: "{{ xci_path }}"
+ changed_when: False
+ delegate_to: 127.0.0.1
+ tags:
+ - skip_ansible_lint
+
- name: Copy releng-xci to remote host
synchronize:
+ archive: yes
src: "{{ xci_path }}/"
dest: "{{ remote_xci_path }}"
- recursive: yes
delete: yes
+ rsync_opts:
+ - "--recursive"
+ - "--files-from={{ xci_cache }}/releng-xci.files"
- name: delete the opnfv_inventory directory
file:
diff --git a/xci/installer/osa/playbooks/configure-opnfvhost.yml b/xci/installer/osa/playbooks/configure-opnfvhost.yml
index b677fecd..994a2607 100644
--- a/xci/installer/osa/playbooks/configure-opnfvhost.yml
+++ b/xci/installer/osa/playbooks/configure-opnfvhost.yml
@@ -42,12 +42,29 @@
proxy_settings_no_proxy: "{{ lookup('env','no_proxy') }}"
tasks:
+ - name: Create list of files to copy
+ shell: |
+ git ls-tree -r --name-only HEAD > {{ xci_cache }}/releng-xci.files
+ echo ".git/" >> {{ xci_cache }}/releng-xci.files
+ echo ".cache/repos/" >> {{ xci_cache }}/releng-xci.files
+ echo ".cache/xci.env" >> {{ xci_cache }}/releng-xci.files
+ args:
+ executable: /bin/bash
+ chdir: "{{ xci_path }}"
+ changed_when: False
+ delegate_to: 127.0.0.1
+ tags:
+ - skip_ansible_lint
+
- name: Copy releng-xci to remote host
synchronize:
+ archive: yes
src: "{{ xci_path }}/"
dest: "{{ remote_xci_path }}"
- recursive: yes
delete: yes
+ rsync_opts:
+ - "--recursive"
+ - "--files-from={{ xci_cache }}/releng-xci.files"
- name: Re-create OpenStack-Ansible /etc directory
file: