summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ansible/load_images.yml30
-rw-r--r--ansible/prepare_openstack.yml16
2 files changed, 7 insertions, 39 deletions
diff --git a/ansible/load_images.yml b/ansible/load_images.yml
index a4c130d46..d4b24c864 100644
--- a/ansible/load_images.yml
+++ b/ansible/load_images.yml
@@ -29,41 +29,15 @@
IMAGE_COMMAND: yardstick-img-modify
IMAGE_OUTPUT: "/tmp/workspace/yardstick/yardstick-image.tar.gz"
-# QCOW_IMAGE: "/tmp/workspace/yardstick/yardstick-image.img"
-# RAW_IMAGE: "/tmp/workspace/yardstick/yardstick-image.tar.gz"
-# IMAGE_COMMANDS:
-# 'lxd': yardstick-img-lxd-modify
-# 'default': yardstick-img-modify
-
-
roles:
- role: add_fuel_jumphost
when: "INSTALLER_TYPE == 'fuel'"
- role: detect_fuel_arch
when: "INSTALLER_TYPE == 'fuel'"
-# post_tasks:
-#
-# - command: "{{ DEPLOY_VARS[DEPLOY_SCENARIO].IMAGE_COMMAND }}" "{{ IMAGE_MODIFY_SCRIPT }}"
-# become: true
-# register: image_modify_result
-# retries: 2
-# untils: image_modify_result|succeeded
-#
-# - stat: path="{{ DEPLOY_VARS[DEPLOY_SCENARIO].IMAGE_OUTPUT }}"}
-# register: output_stat
-#
-# - fail: msg=""
-# when: not output_stat
-
-
- include: build_yardstick_image.yml
+ vars:
+ img_property: normal
- include: image_uploaders/upload_yardstick_image.yml
-# upload cirros
-# upload vanilla ubuntu cloud_image
-
-# - include: create_flavors.yml
-
-
diff --git a/ansible/prepare_openstack.yml b/ansible/prepare_openstack.yml
index 8456c9e59..6f54ef522 100644
--- a/ansible/prepare_openstack.yml
+++ b/ansible/prepare_openstack.yml
@@ -12,27 +12,21 @@
# See the License for the specific language governing permissions and
# limitations under the License.
---
-- name: convert openrc_file to openrc env dict
+- name: Convert openrc_file to openrc env dict
hosts: jumphost
vars_files:
- yardstick_config.yml
roles:
- convert_openrc
-###
-# Build yardstick image for openstack quest
-# check included file for other vars/env
-###
-- include: build_yardstick_image.yml
+- name: Build Yardstick image for OpenStack
+ include: build_yardstick_image.yml
vars:
YARD_IMG_ARCH: amd64
release: xenial
+ img_property: nsb
-###
-# Delete old yardstick image and flavors
-# Upload new image
-###
-- name: cleanup old openstack images, upload new
+- name: Cleanup old OpenStack images and upload the new one
hosts: jumphost
vars_files:
- yardstick_config.yml