diff options
| author |   wutianwei <wutianwei1@huawei.com> | 2017-10-16 11:12:50 +0800 |
|---|---|---|
| committer |   Justin chi <chigang@huawei.com> | 2017-10-16 11:36:55 +0000 |
| commit | e3fc65b43e71c7c83b2019faf11e93aa3ab82b7b (patch) | |
| tree | e5879c9b6bdfbfe358aa6e387fc0b227f153d48b | |
| parent | 1a1f792afdb66343645a3703f4fccb65ba3c11d1 (diff) | |
Ascertain the pandas version
the 0.21.0rc1 version of pandas will block the gnocchi install,
so we use 0.20.3. we replace the pandas package in repo
Change-Id: Ic8d9fa3a691b64a0783034ffbf0d958427e30d16
Signed-off-by: wutianwei <wutianwei1@huawei.com>
(cherry picked from commit 05aafa14c76537222fac2f93fc6ab7bec741cff5)
3 files changed, 27 insertions, 0 deletions
diff --git a/deploy/adapters/ansible/roles/config-osa/tasks/main.yml b/deploy/adapters/ansible/roles/config-osa/tasks/main.yml index 139b426f..d3779fd4 100755 --- a/deploy/adapters/ansible/roles/config-osa/tasks/main.yml +++ b/deploy/adapters/ansible/roles/config-osa/tasks/main.yml @@ -252,3 +252,14 @@ include: noha.yml 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 + insertafter: "^- include: repo_post_build.yml" + line: "- include: repo_fix_pandas.yml" diff --git a/deploy/adapters/ansible/roles/config-osa/templates/repo_fix_pandas.yml b/deploy/adapters/ansible/roles/config-osa/templates/repo_fix_pandas.yml new file mode 100644 index 00000000..4605089f --- /dev/null +++ b/deploy/adapters/ansible/roles/config-osa/templates/repo_fix_pandas.yml @@ -0,0 +1,15 @@ +############################################################################## +# 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: change pandas version + shell: | + mkdir -p /tmp/pandas; + pip install pandas==0.20.3 -d /tmp/pandas; + rm -rf {{ repo_dest_path }}/pandas* + cp /tmp/pandas/pandas-0.20.3-cp27-cp27mu-manylinux1_x86_64.whl {{ repo_dest_path }} diff --git a/deploy/adapters/ansible/roles/config-osa/vars/main.yml b/deploy/adapters/ansible/roles/config-osa/vars/main.yml index 3c95bc64..18687fa5 100644 --- a/deploy/adapters/ansible/roles/config-osa/vars/main.yml +++ b/deploy/adapters/ansible/roles/config-osa/vars/main.yml @@ -9,3 +9,4 @@ --- LOCAL_REPOSITORY_IP: "192.168.137.222" ceph_host: "{{ hostvars[inventory_hostname]['groups']['ceph_osd'][0] }}" +repo_dest_path: "/var/www/repo/os-releases/15.1.4/ubuntu-16.04-x86_64/" |