From c7c51d5100e8eba93337c34bd9eb101ec4cf70df Mon Sep 17 00:00:00 2001 From: Malanik Jan Date: Tue, 18 Jul 2017 12:54:10 -0400 Subject: yardstick setup ansible, including load_images also update to cirros 0.3.5 added PROX compilation add create_node_pod_yaml role JIRA: YARDSTICK-639 Change-Id: If5999841287a54c7e5c64a7cc487c6394df90424 Signed-off-by: Malanik Jan Signed-off-by: Ross Brattain --- ansible/roles/convert_openrc/defaults/main.yml | 17 +++++++ ansible/roles/convert_openrc/tasks/main.yml | 55 ++++++++++++++++++++++ .../roles/convert_openrc/templates/clouds.yaml.j2 | 9 ++++ 3 files changed, 81 insertions(+) create mode 100644 ansible/roles/convert_openrc/defaults/main.yml create mode 100644 ansible/roles/convert_openrc/tasks/main.yml create mode 100644 ansible/roles/convert_openrc/templates/clouds.yaml.j2 (limited to 'ansible/roles/convert_openrc') diff --git a/ansible/roles/convert_openrc/defaults/main.yml b/ansible/roles/convert_openrc/defaults/main.yml new file mode 100644 index 000000000..dffca1078 --- /dev/null +++ b/ansible/roles/convert_openrc/defaults/main.yml @@ -0,0 +1,17 @@ +# 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. +--- +openrc_file: "openrc" +cloud_yaml_path: "{{ playbook_dir }}/clouds.yaml" + diff --git a/ansible/roles/convert_openrc/tasks/main.yml b/ansible/roles/convert_openrc/tasks/main.yml new file mode 100644 index 000000000..1606b0bc5 --- /dev/null +++ b/ansible/roles/convert_openrc/tasks/main.yml @@ -0,0 +1,55 @@ +# 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. +--- +- name: parse openrc into openstack auth dict + parse_shell_file: path="{{ openrc_file }}" fact_name="openrc" + +- debug: var=openrc + +- set_fact: + yardstick_url_ip: "{{ openrc.OS_AUTH_URL|urlsplit|attr('hostname') }}" + +- debug: var=yardstick_url_ip + +# This doesn't work, due to OS_IDENTITY_API_VERSION, use environment + +- set_fact: + os_auth: + auth_url: "{{ openrc.OS_AUTH_URL }}" + password: "{{ openrc.OS_PASSWORD }}" + username: "{{ openrc.OS_USERNAME }}" + project_name: "{{ openrc.OS_PROJECT_NAME }}" +# tenant_name: "{{ openrc.OS_TENANT_NAME }}" + project_domain_name: "{{ openrc.OS_PROJECT_DOMAIN_NAME }}" +# user_domain_name: "{{ openrc.OS_USER_DOMAIN_NAME }}" + # BUGS: We need to specify identity_api_version == 3, but we can't do it here + # because it is not the write place + # we need to set it via OS_IDENTITY_API_VERSION or clouds.yaml +# identity_api_version: "{{ openrc.OS_IDENTITY_API_VERSION }}" + +- debug: var=os_auth + +- set_fact: + clouds: + demo: + # must specify API version here + identity_api_version: "{{ openrc.OS_IDENTITY_API_VERSION }}" + auth: "{{ os_auth }}" + +- template: + src: clouds.yaml.j2 + # this is autodetected and used + dest: "{{ cloud_yaml_path }}" + when: write_cloud_yaml|default(False) + diff --git a/ansible/roles/convert_openrc/templates/clouds.yaml.j2 b/ansible/roles/convert_openrc/templates/clouds.yaml.j2 new file mode 100644 index 000000000..b1a76cb76 --- /dev/null +++ b/ansible/roles/convert_openrc/templates/clouds.yaml.j2 @@ -0,0 +1,9 @@ +clouds: + demo: + identity_api_version: "{{ openrc.OS_IDENTITY_API_VERSION }}" + auth: + auth_url: "{{ openrc.OS_AUTH_URL }}" + password: "{{ openrc.OS_PASSWORD }}" + username: "{{ openrc.OS_USERNAME }}" + project_name: "{{ openrc.OS_PROJECT_NAME }}" + project_domain_name: "{{ openrc.OS_PROJECT_DOMAIN_NAME }}" -- cgit 1.2.3-korg