Merge "Re-deploy the Nova venv if it mismatches the repo"

This commit is contained in:
Jenkins 2016-01-29 03:00:19 +00:00 committed by Gerrit Code Review
commit 915b6217ba
2 changed files with 47 additions and 3 deletions

View File

@ -296,6 +296,7 @@ nova_requires_pip_packages:
- virtualenv - virtualenv
- virtualenv-tools - virtualenv-tools
- python-keystoneclient # Keystoneclient needed to OSA keystone lib - python-keystoneclient # Keystoneclient needed to OSA keystone lib
- httplib2
nova_compute_pip_packages: nova_compute_pip_packages:
- libvirt-python - libvirt-python

View File

@ -51,13 +51,42 @@
- nova-install - nova-install
- nova-pip-packages - nova-pip-packages
- name: Get local venv checksum
stat:
path: "/var/cache/{{ nova_venv_download_url | basename }}"
get_md5: False
when: nova_venv_enabled | bool
register: local_venv_stat
tags:
- nova-install
- nova-pip-packages
- name: Get remote venv checksum
uri:
url: "{{ nova_venv_download_url | replace('tgz', 'checksum') }}"
return_content: True
when: nova_venv_enabled | bool
register: remote_venv_checksum
tags:
- nova-install
- nova-pip-packages
# TODO: When project moves to ansible 2 we can pass this a sha256sum which will:
# a) allow us to remove force: yes
# b) allow the module to calculate the checksum of dest file which would
# result in file being downloaded only if provided and dest sha256sum
# checksums differ
- name: Attempt venv download - name: Attempt venv download
get_url: get_url:
url: "{{ nova_venv_download_url }}" url: "{{ nova_venv_download_url }}"
dest: "/var/cache/{{ nova_venv_download_url | basename }}" dest: "/var/cache/{{ nova_venv_download_url | basename }}"
force: yes
ignore_errors: true ignore_errors: true
register: get_venv register: get_venv
when: nova_venv_enabled | bool when:
- nova_venv_enabled | bool
- (local_venv_stat.stat.exists == False or
{{ local_venv_stat.stat.checksum is defined and local_venv_stat.stat.checksum != remote_venv_checksum.content | trim }})
tags: tags:
- nova-install - nova-install
- nova-pip-packages - nova-pip-packages
@ -70,13 +99,24 @@
- nova-install - nova-install
- nova-pip-packages - nova-pip-packages
- name: Remove existing venv
file:
path: "{{ nova_venv_bin | dirname }}"
state: absent
when:
- nova_venv_enabled | bool
- nova_get_venv | changed
tags:
- nova-install
- nova-pip-packages
- name: Create nova venv dir - name: Create nova venv dir
file: file:
path: "{{ nova_venv_bin | dirname }}" path: "{{ nova_venv_bin | dirname }}"
state: directory state: directory
when: when:
- nova_venv_enabled | bool - nova_venv_enabled | bool
- nova_get_venv | success - nova_get_venv | changed
tags: tags:
- nova-install - nova-install
- nova-pip-packages - nova-pip-packages
@ -88,7 +128,8 @@
copy: "no" copy: "no"
when: when:
- nova_venv_enabled | bool - nova_venv_enabled | bool
- nova_get_venv | success - nova_get_venv | changed
notify: Restart nova services
tags: tags:
- nova-install - nova-install
- nova-pip-packages - nova-pip-packages
@ -118,6 +159,7 @@
when: when:
- nova_venv_enabled | bool - nova_venv_enabled | bool
- nova_get_venv | failed - nova_get_venv | failed
notify: Restart nova services
tags: tags:
- nova-install - nova-install
- nova-pip-packages - nova-pip-packages
@ -133,6 +175,7 @@
delay: 2 delay: 2
with_items: nova_pip_packages with_items: nova_pip_packages
when: not nova_venv_enabled | bool when: not nova_venv_enabled | bool
notify: Restart nova services
tags: tags:
- nova-install - nova-install
- nova-pip-packages - nova-pip-packages