1 files changed, 25 insertions, 38 deletions
diff --git a/xci/installer/osa/playbooks/configure-targethosts.yml b/xci/installer/osa/playbooks/configure-targethosts.yml
index fb43a920..dfa17696 100644
--- a/xci/installer/osa/playbooks/configure-targethosts.yml
+++ b/xci/installer/osa/playbooks/configure-targethosts.yml
@@ -1,49 +1,36 @@
 ---
-- hosts: all
-  remote_user: root
-  tasks:
-    - name: add public key to host
-      copy:
-        src: "{{ XCI_PATH }}/xci/files/authorized_keys"
-        dest: /root/.ssh/authorized_keys
-
-- hosts: controller
+- hosts: openstack
+  environment:
+    http_proxy: "{{ lookup('env','http_proxy') }}"
+    https_proxy: "{{ lookup('env','https_proxy') }}"
+    no_proxy: "{{ lookup('env','no_proxy') }}"
+    HTTP_PROXY: "{{ lookup('env','http_proxy') }}"
+    HTTPS_PROXY: "{{ lookup('env','https_proxy') }}"
+    NO_PROXY: "{{ lookup('env','no_proxy') }}"
   remote_user: root
   vars_files:
-    - "{{ XCI_PATH }}/xci/var/opnfv.yml"
+    - "{{ xci_path }}/xci/var/opnfv.yml"
 
   pre_tasks:
     - name: Load distribution variables
       include_vars:
         file: "{{ item }}"
       with_items:
-        - "{{ XCI_PATH }}/xci/var/{{ ansible_os_family }}.yml"
-        - "{{ XCI_FLAVOR_ANSIBLE_FILE_PATH }}/flavor-vars.yml"
-  roles:
-    - role: configure-network
-    # we need to force sync time with ntp or the nodes will be out of sync timewise
-    - role: synchronize-time
-
-- hosts: compute
-  remote_user: root
-  vars_files:
-    - "{{ XCI_PATH }}/xci/var/opnfv.yml"
-
-  pre_tasks:
-    - name: Load distribution variables
-      include_vars:
-        file: "{{ item }}"
-      with_items:
-        - "{{ XCI_PATH }}/xci/var/{{ ansible_os_family }}.yml"
-        - "{{ XCI_FLAVOR_ANSIBLE_FILE_PATH }}/flavor-vars.yml"
-  roles:
-    - role: configure-network
-    # we need to force sync time with ntp or the nodes will be out of sync timewise
-    - role: synchronize-time
-    - role: configure-ceph
-      when: XCI_CEPH_ENABLED == "true"
-
-- hosts: compute00
-  remote_user: root
+        - "{{ xci_path }}/xci/var/{{ ansible_os_family }}.yml"
   roles:
+    - role: ruzickap.proxy_settings
+      proxy_settings_http_proxy: "{{ lookup('env','http_proxy') }}"
+      proxy_settings_https_proxy: "{{ lookup('env','https_proxy') }}"
+      proxy_settings_ftp_proxy: "{{ lookup('env','ftp_proxy') }}"
+      proxy_settings_no_proxy: "{{ lookup('env','no_proxy') }}"
+    - role: bootstrap-host
     - role: configure-nfs
+      when:
+        - "'compute' in group_names"
+    - role: configure-ceph
+      when:
+        - xci_ceph_enabled == "true"
+        - "'compute' in group_names"
+  tasks:
+    - name: Manage SSH keys
+      include_tasks: "{{ xci_path }}/xci/playbooks/manage-ssh-keys.yml"