Merge "Add a document describing vIPSEC testcase"

[yardstick.git] / ansible / infra_deploy.yml

diff --git a/ansible/infra_deploy.yml b/ansible/infra_deploy.yml
index 948dd33..4a5716e 100644 (file)
--- a/ansible/infra_deploy.yml
+++ b/ansible/infra_deploy.yml
@@ -13,7 +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