diff options
| author |   wutianwei <wutianwei1@huawei.com> | 2017-12-25 15:39:50 +0800 |
|---|---|---|
| committer | wutianwei <wutianwei1@huawei.com> | 2017-12-25 18:58:17 +0800 |
| commit | 84f36e9f062c056cbb8ee15c94c4cc208dbc7766 (patch) | |
| tree | a54b3245ae3084124beb1dfe08f29e6c71c0d53b /deploy/adapters/ansible | |
| parent | a360411cb8c775dffa24a4157cec2b566cbde6f3 (diff) | |
fix the lz4 packages dependence
1. install pkgconfig
2. mv the tasks of fixing pip issue out of the main script
Change-Id: Icc08a3c461690d1d6747455479df0a58d87d22da
Signed-off-by: wutianwei <wutianwei1@huawei.com>
Diffstat (limited to 'deploy/adapters/ansible')
| -rw-r--r-- | deploy/adapters/ansible/roles/config-osa/tasks/fix_pip_version.yml | 25 | ||||
| -rwxr-xr-x | deploy/adapters/ansible/roles/config-osa/tasks/main.yml | 11 |
2 files changed, 26 insertions, 10 deletions
diff --git a/deploy/adapters/ansible/roles/config-osa/tasks/fix_pip_version.yml b/deploy/adapters/ansible/roles/config-osa/tasks/fix_pip_version.yml new file mode 100644 index 00000000..61d263b4 --- /dev/null +++ b/deploy/adapters/ansible/roles/config-osa/tasks/fix_pip_version.yml @@ -0,0 +1,25 @@ +# ############################################################################# +# Copyright (c) 2017 HUAWEI TECHNOLOGIES CO.,LTD and others. +# +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +# ############################################################################# +--- +- name: copy the repo_fix_andas.yml + template: + src: repo_fix_pandas.yml + dest: /etc/ansible/roles/repo_build/tasks/repo_fix_pandas.yml + +- name: fix the python-ldap version + lineinfile: + dest: /etc/ansible/roles/os_keystone/defaults/main.yml + regexp: '^ - python-ldap' + line: ' - python-ldap==2.5.2' + +- name: add pkgconfig in gnocchi requires pip packages + lineinfile: + dest: /etc/ansible/roles/repo_build/defaults/main.yml + insertafter: "repo_pip_packages:" + line: ' - pkgconfig' diff --git a/deploy/adapters/ansible/roles/config-osa/tasks/main.yml b/deploy/adapters/ansible/roles/config-osa/tasks/main.yml index 49e4e26d..855412ab 100755 --- a/deploy/adapters/ansible/roles/config-osa/tasks/main.yml +++ b/deploy/adapters/ansible/roles/config-osa/tasks/main.yml @@ -314,11 +314,6 @@ when: - "{{ hostvars[inventory_hostname]['groups']['controller'] | length < 2 }}" -- name: copy the repo_fix_andas.yml - template: - src: repo_fix_pandas.yml - dest: /etc/ansible/roles/repo_build/tasks/repo_fix_pandas.yml - # - name: change repore build # lineinfile: # dest: /etc/ansible/roles/repo_build/tasks/main.yml @@ -327,10 +322,6 @@ - include: meters.yml -- name: fix the python-ldap version - lineinfile: - dest: /etc/ansible/roles/os_keystone/defaults/main.yml - regexp: '^ - python-ldap' - line: ' - python-ldap==2.5.2' +- include: fix_pip_version.yml - include: fix_rescue.yml |