1 files changed, 80 insertions, 14 deletions
diff --git a/deploy/adapters/ansible/roles/config-osa/tasks/main.yml b/deploy/adapters/ansible/roles/config-osa/tasks/main.yml
index 5f4f2fb2..ab2714a9 100755
--- a/deploy/adapters/ansible/roles/config-osa/tasks/main.yml
+++ b/deploy/adapters/ansible/roles/config-osa/tasks/main.yml
@@ -163,7 +163,7 @@
 
 - name: remove repo_build_pip_no_binary
   lineinfile:
-    dest: /opt/openstack-ansible/group_vars/repo_all.yml
+    dest: /opt/openstack-ansible/inventory/group_vars/repo_all.yml
     state: absent
     regexp: "{{ item }}"
   with_items: ['^repo_build_pip_no_binary:', '^  - libvirt-python']
@@ -348,23 +348,89 @@
 #    insertafter: "^- include: repo_post_build.yml"
 #    line: "- include: repo_fix_pandas.yml"
 
-- include: meters.yml
+- include: fix_rescue.yml
 
-# upstream has fix this issue so somments it
-# maybe will use in the furture
-- include: fix_pip_version.yml
+- name: rm command "rm -f /etc/resolv.conf" in cache_prep_commands
+  lineinfile:
+    dest: /etc/ansible/roles/lxc_hosts/vars/ubuntu-16.04.yml
+    regexp: 'rm -f /etc/resolv.conf$'
+    line: '      echo "ok"'
+    backrefs: 'yes'
 
-- include: fix_rescue.yml
+- name: add command "rm /etc/resolv.conf || true" in cache_prep_commands
+  lineinfile:
+    dest: /etc/ansible/roles/lxc_hosts/vars/ubuntu-16.04.yml
+    insertafter: '^  cache_prep_commands:'
+    line: '    rm /etc/resolv.conf || true'
 
-- name: include tacker in setup-openstack
+- name: fix apt prompt issue
   lineinfile:
-    dest: /opt/openstack-ansible/playbooks/setup-openstack.yml
-    insertafter: "^- include: os-trove"
-    line: "- include: os-tacker-install.yml"
+    dest: /etc/ansible/roles/lxc_hosts/vars/ubuntu-16.04.yml
+    state: absent
+    regexp: "apt-get upgrade -y"
 
-- name: add variables file of tacker for centos
+- name: set pre-staged retry to 120
+  replace:
+    dest: /etc/ansible/roles/lxc_hosts/tasks/lxc_cache_preparation_systemd_new.yml
+    regexp: '^  retries: 60'
+    replace: '  retries: 120'
+
+- name: copy lxc_cache_prestage.patch
   copy:
-    src: redhat-7.yml
-    dest: /etc/ansible/roles/os_tacker/vars/redhat-7.yml
+    src: lxc_cache_prestage.patch
+    dest: /etc/ansible/roles/lxc_hosts/tasks/lxc_cache_prestage.patch
+  when:
+    - checkresult.rc == 0
+    - offline_deployment is defined and offline_deployment == "Disable"
+
+- name: patch lxc_cache_prestage.yml
+  shell:
+    patch -p0 < lxc_cache_prestage.patch
+  args:
+    chdir: /etc/ansible/roles/lxc_hosts/tasks/
+  when:
+    - checkresult.rc == 0
+    - offline_deployment is defined and offline_deployment == "Disable"
+  ignore_errors: "true"
+
+- name: add cache refresh
+  blockinfile:
+    dest: /opt/openstack-ansible/playbooks/setup-infrastructure.yml
+    insertbefore: '^- include: unbound-install.yml'
+    block: |
+      - hosts: all
+        user: root
+        tasks:
+          - name: refresh
+            setup:
 
-- include: set_openstack_release.yml
+- name: create openstack git directory
+  file:
+    path: /opt/git/openstack
+    state: directory
+  when:
+    - checkresult.rc == 0
+    - offline_deployment is defined and offline_deployment == "Disable"
+
+- name: download openstack git package
+  get_url:
+    url: "http://192.168.137.222/download/openstack-queens-git.tar.gz"
+    dest: "/opt/git/openstack"
+  when:
+    - checkresult.rc == 0
+    - offline_deployment is defined and offline_deployment == "Disable"
+
+- name: extract openstack git repo
+  shell:
+    tar zxf openstack-queens-git.tar.gz
+  args:
+    chdir: "/opt/git/openstack"
+  when:
+    - checkresult.rc == 0
+    - offline_deployment is defined and offline_deployment == "Disable"
+
+- name: fix keepalived
+  lineinfile:
+    dest: /opt/openstack-ansible/inventory/group_vars/haproxy/keepalived.yml
+    regexp: 'check_script: "/bin/kill -0 `cat /var/run/haproxy.pid`"'
+    line: '    check_script: "/bin/kill -0 `cat /var/run/haproxy.pid` || true"'