X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=ansible%2Finfra_deploy.yml;h=4a5716eee8899dca62657ff701bd2ff061d98ee8;hb=a0d32548802e608c2b0d984006221d439cb1a035;hp=4ad21af00afbd8787a38ba1663cf03c473df08c4;hpb=14a0f0b13e37cf0a65603915b7c75b86fd4a4383;p=yardstick.git

diff --git a/ansible/infra_deploy.yml b/ansible/infra_deploy.yml
index 4ad21af00..4a5716eee 100644
--- a/ansible/infra_deploy.yml
+++ b/ansible/infra_deploy.yml
@@ -13,9 +13,38 @@
 # limitations under the License.
 ---
 - hosts: jumphost
+  vars:
+    rs_file: "{{ RS_FILE }}"
+    clean_up: "{{ CLEAN_UP | default(False) }}" # If True will be delete all VMs, networks, disk images
+
+  tasks:
+  - set_fact:
+      proxy_host: "{{ lookup('env', 'http_proxy') | urlsplit('hostname') }}"
+      proxy_proto: "{{ lookup('env', 'http_proxy') | urlsplit('scheme') }}"
+      proxy_port: "{{ lookup('env', 'http_proxy') | urlsplit('port') }}"
+
+  - set_fact:
+      proxy_host_ip: "{{ lookup('dig', proxy_host) }}"
 
   roles:
-    - infra_check_requirements
+    - infra_install_dependencies
     - infra_destroy_previous_configuration
+    - infra_check_requirements
     - infra_create_network
     - infra_create_vms
+    - infra_prepare_vms
+
+- hosts: deploy,regular,yardstickG
+  gather_facts: no
+  become: yes
+
+  roles:
+  - infra_rampup_stack_nodes
+
+
+- hosts: deploy
+  become: yes
+  environment: "{{ proxy_env }}"
+
+  roles:
+  - infra_deploy_openstack