Merge "yardstick setup ansible, including load_images"

3 files changed, 125 insertions, 0 deletions

diff --git a/ansible/image_uploaders/upload_cirros_image.yml b/ansible/image_uploaders/upload_cirros_image.yml
new file mode 100644
index 000000000..eba55dbb7
--- /dev/null
+++ b/ansible/image_uploaders/upload_cirros_image.yml
@@ -0,0 +1,34 @@
+# Copyright (c) 2017 Intel Corporation.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+---
+- hosts: yardstick
+
+  tasks:
+    - set_fact:
+        image_properties:
+           hw_mem_page_size: 'large'
+      when: fdio
+
+    - os_image:
+        name: "{{ cirros_image }}"
+        is_public: yes
+        disk_format: qcow2
+        container_format: bare
+        filename: "{{ cirros_image_file }}"
+        properties: "{{ image_properties }}"
+      environment: "{{ openrc }}"
+
+    - os_image_facts:
+        name: "{{ cirros_image }}"
+      environment: "{{ openrc }}"
diff --git a/ansible/image_uploaders/upload_ubuntu_image.yml b/ansible/image_uploaders/upload_ubuntu_image.yml
new file mode 100644
index 000000000..dcfe6480c
--- /dev/null
+++ b/ansible/image_uploaders/upload_ubuntu_image.yml
@@ -0,0 +1,34 @@
+# Copyright (c) 2017 Intel Corporation.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+---
+- hosts: yardstick
+
+  tasks:
+    - set_fact:
+        image_properties:
+           hw_mem_page_size: 'large'
+      when: fdio
+
+    - os_image:
+        name: "{{ ubuntu_image }}"
+        is_public: yes
+        disk_format: qcow2
+        container_format: bare
+        filename: "{{ ubuntu_image_file }}"
+        properties: "{{ image_properties }}"
+      environment: "{{ openrc }}"
+
+    - os_image_facts:
+        name: "{{ ubuntu_image }}"
+      environment: "{{ openrc }}"
diff --git a/ansible/image_uploaders/upload_yardstick_image.yml b/ansible/image_uploaders/upload_yardstick_image.yml
new file mode 100644
index 000000000..9364c52a5
--- /dev/null
+++ b/ansible/image_uploaders/upload_yardstick_image.yml
@@ -0,0 +1,57 @@
+# Copyright (c) 2017 Intel Corporation.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+---
+- hosts: yardstick
+
+  tasks:
+    - get_url:
+        url: "{{ CLOUD_IMG_URL }}"
+        dest: "{{ CLOUD_IMAGE }}"
+
+    - name: Extra cloud image kernel
+    - unarchive:
+        asdf:
+
+    - os_image:
+        name: yardstick-{{ release }}-kernel
+        is_public: yes
+        disk_format: qcow2
+        container_format: bare
+        filename: "{{ CLOUD_KERNEL }}"
+
+    - set_fact:
+        image_properties:
+          kernel_id: "{{ GLANCE_KERNEL_ID }}"
+          os_command_line: "{{ command_line }}"
+
+    - set_fact:
+        image_properties: "{{ image_properties|combine({'hw_mem_page_size': 'large'} }}"
+      when: fdio
+
+    - set_fact:
+        image_properties: "{{ image_properties|combine({'hw_firmware_type': HW_FIRMWARE_TYPE} }}"
+      when: HW_FIRMWARE_TYPE
+
+    - os_image:
+        name: yardstick-image
+        is_public: yes
+        disk_format: qcow2
+        container_format: bare
+        filename: "{{ QCOW2_IMAGE }}"
+        properties: "{{ image_properties }}"
+      environment: "{{ openrc }}"
+
+    - os_image_facts:
+        name: yardstick-image
+      environment: "{{ openrc }}"