aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYifei Xue <xueyifei@huawei.com>2017-12-29 09:30:28 +0800
committerYifei Xue <xueyifei@huawei.com>2017-12-29 09:30:28 +0800
commitd88d2158f94c72639b3f0ec635553bc0a7c82755 (patch)
tree267c3c83eccea59d94029fdf89dc560df22860b5
parent1be06d2cdf5ae5308b4efdadd97a59021738f055 (diff)
Bug fix for offline deployment of euphrates branchstable/euphrates
JIRA: - For offline deployment, there is no need to fix the pandas and python-ldap version. Change-Id: I30fa1f2af8ad13e115c0078c4f33102936bdd71d Signed-off-by: Yifei Xue <xueyifei@huawei.com>
-rwxr-xr-xdeploy/adapters/ansible/roles/config-osa/tasks/main.yml5
1 files changed, 4 insertions, 1 deletions
diff --git a/deploy/adapters/ansible/roles/config-osa/tasks/main.yml b/deploy/adapters/ansible/roles/config-osa/tasks/main.yml
index 95bfbc0..1fdcea4 100755
--- a/deploy/adapters/ansible/roles/config-osa/tasks/main.yml
+++ b/deploy/adapters/ansible/roles/config-osa/tasks/main.yml
@@ -265,16 +265,18 @@
when:
- "{{ hostvars[inventory_hostname]['groups']['controller'] | length < 2 }}"
-- name: copy the repo_fix_andas.yml
+- name: copy the repo_fix_pandas.yml
template:
src: repo_fix_pandas.yml
dest: /etc/ansible/roles/repo_build/tasks/repo_fix_pandas.yml
+ when: offline_deployment is defined and offline_deployment == "Disable"
- 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"
+ when: offline_deployment is defined and offline_deployment == "Disable"
- include: meters.yml
@@ -283,3 +285,4 @@
dest: /etc/ansible/roles/os_keystone/defaults/main.yml
regexp: '^ - python-ldap'
line: ' - python-ldap==2.5.2'
+ when: offline_deployment is defined and offline_deployment == "Disable"