Bug fix for offline deployment of euphrates branch 49/49749/1
authorYifei Xue <xueyifei@huawei.com>
Fri, 29 Dec 2017 01:30:28 +0000 (09:30 +0800)
committerYifei Xue <xueyifei@huawei.com>
Fri, 29 Dec 2017 01:30:28 +0000 (09:30 +0800)
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>
deploy/adapters/ansible/roles/config-osa/tasks/main.yml

index 95bfbc0..1fdcea4 100755 (executable)
   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
 
     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"