summaryrefslogtreecommitdiffstats
path: root/deploy/adapters/ansible/roles/config-osa
diff options
context:
space:
mode:
authorHarry Huang <huangxiangyu5@huawei.com>2018-01-22 12:12:08 +0800
committerHarry Huang <huangxiangyu5@huawei.com>2018-02-07 10:41:57 +0800
commitbb9f83caad0d76277144d53caabe43fd317ce268 (patch)
treeef745000d2289ff1b497433c020bd8da8c88bf5b /deploy/adapters/ansible/roles/config-osa
parent26f656961306239075612ac75a92b79db44e1539 (diff)
Add workaround for horizon image upload issue
JIRA: COMPASS-573 1. With HORIZON_IMAGES_UPLOAD_MODE set to direct Horizon provides the endpoint for Glance based on OPENSTACK_ENDPOINT_TYPE. If OPENSTACK_ENDPOINT_TYPE is set to internalURL any browser outside the internal network is unable to upload image. Add ansible task to set HORIZON_IMAGES_UPLOAD_MODE to legacy as a workaround. 2. Add ansible lookup plugin to get openstack release 3. set openstack_release into group_vars/all in config-osa to make this variable readable for other tasks Change-Id: I9ef358e1f4acb0c329a032e18359de12284f3b56 Signed-off-by: Harry Huang <huangxiangyu5@huawei.com>
Diffstat (limited to 'deploy/adapters/ansible/roles/config-osa')
-rwxr-xr-xdeploy/adapters/ansible/roles/config-osa/tasks/main.yml2
-rw-r--r--deploy/adapters/ansible/roles/config-osa/tasks/set_openstack_release.yml15
-rw-r--r--deploy/adapters/ansible/roles/config-osa/vars/main.yml3
3 files changed, 20 insertions, 0 deletions
diff --git a/deploy/adapters/ansible/roles/config-osa/tasks/main.yml b/deploy/adapters/ansible/roles/config-osa/tasks/main.yml
index 74d930e2..5f4f2fb2 100755
--- a/deploy/adapters/ansible/roles/config-osa/tasks/main.yml
+++ b/deploy/adapters/ansible/roles/config-osa/tasks/main.yml
@@ -366,3 +366,5 @@
copy:
src: redhat-7.yml
dest: /etc/ansible/roles/os_tacker/vars/redhat-7.yml
+
+- include: set_openstack_release.yml
diff --git a/deploy/adapters/ansible/roles/config-osa/tasks/set_openstack_release.yml b/deploy/adapters/ansible/roles/config-osa/tasks/set_openstack_release.yml
new file mode 100644
index 00000000..c886eabf
--- /dev/null
+++ b/deploy/adapters/ansible/roles/config-osa/tasks/set_openstack_release.yml
@@ -0,0 +1,15 @@
+############################################################################
+# Copyright (c) 2018 HUAWEI TECHNOLOGIES CO.,LTD and others.
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+---
+- name: set openstack release
+ lineinfile:
+ dest: "{{ run_dir }}/group_vars/all"
+ line: "openstack_release: {{ openstack_release }}"
+
+- meta: refresh_inventory
diff --git a/deploy/adapters/ansible/roles/config-osa/vars/main.yml b/deploy/adapters/ansible/roles/config-osa/vars/main.yml
index 0b3b0c1e..65f67c18 100644
--- a/deploy/adapters/ansible/roles/config-osa/vars/main.yml
+++ b/deploy/adapters/ansible/roles/config-osa/vars/main.yml
@@ -11,3 +11,6 @@ LOCAL_REPOSITORY_IP: "192.168.137.222"
ceph_host: "{{ hostvars[inventory_hostname]['groups']['ceph_osd'][0] }}"
repo_dest_path: "/var/www/repo/os-releases/15.1.4/ubuntu-16.04-x86_64/"
networking_sfc_version: 4.0.0
+# yamllint disable rule:line-length
+openstack_release: "{{ lookup('yamlfile', '/opt/openstack-ansible/group_vars/all/all.yml key=openstack_release') }}"
+# yamllint enable rule:line-length