diff options
| author |   Emma Foley <emma.l.foley@intel.com> | 2019-01-07 15:29:27 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2019-01-07 15:29:27 +0000 |
| commit | 75883619fb111a23ed32c30a3498665d79a1fb72 (patch) | |
| tree | 90c604272c31ac391c37b3080e9a4659293ea8db | |
| parent | fd5fdb646ae46819fe2f80e35d0d2630a620e8ee (diff) | |
| parent | e2f48a4ac921ac56827a98ffa51545c7095c5a3f (diff) | |
Merge "Sync up 'install.yaml' with 'nsb_setup.yml'"
| -rw-r--r-- | ansible/install.yaml | 37 | ||||
| -rwxr-xr-x | ansible/roles/install_dependencies_jumphost/tasks/Debian.yml | 10 |
2 files changed, 41 insertions, 6 deletions
diff --git a/ansible/install.yaml b/ansible/install.yaml index f4f57bdc0..d181c5ffd 100644 --- a/ansible/install.yaml +++ b/ansible/install.yaml @@ -100,9 +100,12 @@ - install_pmu_tools - download_collectd - install_collectd + - docker + - barometer_collectd -- hosts: jumphost +- name: Prepare to build VM + hosts: jumphost become: yes vars: img_prop_item: "{{ IMG_PROPERTY }}" @@ -116,7 +119,8 @@ when: installation_mode != inst_mode_container -- hosts: chroot_image +- name: Build VM in chroot + hosts: chroot_image connection: chroot become: yes vars: @@ -131,7 +135,8 @@ when: installation_mode != inst_mode_container -- hosts: jumphost +- name: Clear up after VM is built + hosts: jumphost become: yes tasks: @@ -142,11 +147,33 @@ when: installation_mode != inst_mode_container -- name: start yardstick container on jumphost +- hosts: jumphost + vars_files: + - yardstick_config.yml + + roles: + - { role: convert_openrc, when: openrc_file is defined } + + +- name: Add OpenStack variables, image + hosts: jumphost + vars_files: + - yardstick_config.yml + environment: + "{{ openrc }}" + + roles: + - { role: clean_images, when: openrc_file is defined } + - { role: clean_flavors, when: openrc_file is defined } + - { role: create_samplevnfs_image, when: openrc_file is defined } + + +- name: Start yardstick container on jumphost hosts: jumphost tasks: - - include_role: + - name: Install docker needed to pull Yardstick container + include_role: name: docker when: installation_mode == inst_mode_container_pull diff --git a/ansible/roles/install_dependencies_jumphost/tasks/Debian.yml b/ansible/roles/install_dependencies_jumphost/tasks/Debian.yml index 6c3900d26..a229cc1a2 100755 --- a/ansible/roles/install_dependencies_jumphost/tasks/Debian.yml +++ b/ansible/roles/install_dependencies_jumphost/tasks/Debian.yml @@ -91,8 +91,16 @@ - ansible_distribution == 'Ubuntu' - ansible_distribution_major_version|int >= 17 +- name: Uninstall docker as it conflicts with docker-py + pip: + name: + - docker + state: absent + - name: Install required docker-py module pip: - name: docker-py + name: + - docker-py + - shade state: latest environment: "{{ proxy_env }}" |