aboutsummaryrefslogtreecommitdiffstats
path: root/deploy/adapters/ansible/roles
diff options
context:
space:
mode:
authorYifei Xue <xueyifei@huawei.com>2018-03-20 08:48:52 +0000
committerGerrit Code Review <gerrit@opnfv.org>2018-03-20 08:48:52 +0000
commit5663222a6ca1de03a28a4d1f85f827b81b91439f (patch)
tree27d317136f091e2d47de4f5382cff33543972223 /deploy/adapters/ansible/roles
parentd070198fbe5756e1f5a969c05a940a3a01b74a21 (diff)
parent9516282c82d34cad3bfc391d5204922ee4620208 (diff)
Merge "Fix workaround of image upload through horizon"
Diffstat (limited to 'deploy/adapters/ansible/roles')
-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/post-openstack/tasks/main.yml4
-rw-r--r--deploy/adapters/ansible/roles/post-openstack/vars/main.yml4
-rw-r--r--deploy/adapters/ansible/roles/post-osa/vars/main.yml4
5 files changed, 9 insertions, 20 deletions
diff --git a/deploy/adapters/ansible/roles/config-osa/tasks/main.yml b/deploy/adapters/ansible/roles/config-osa/tasks/main.yml
index 5f4f2fb..74d930e 100755
--- a/deploy/adapters/ansible/roles/config-osa/tasks/main.yml
+++ b/deploy/adapters/ansible/roles/config-osa/tasks/main.yml
@@ -366,5 +366,3 @@
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
deleted file mode 100644
index c886eab..0000000
--- a/deploy/adapters/ansible/roles/config-osa/tasks/set_openstack_release.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-############################################################################
-# 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/post-openstack/tasks/main.yml b/deploy/adapters/ansible/roles/post-openstack/tasks/main.yml
index d558239..0bd9aef 100644
--- a/deploy/adapters/ansible/roles/post-openstack/tasks/main.yml
+++ b/deploy/adapters/ansible/roles/post-openstack/tasks/main.yml
@@ -77,7 +77,7 @@
regexp: "^HORIZON_IMAGES_UPLOAD_MODE"
line: "HORIZON_IMAGES_UPLOAD_MODE = 'legacy'"
when:
- - inventory_hostname in groups['dashboard_containers']
+ - inventory_hostname in groups['horizon']
# yamllint enable rule:line-length
- name: restart apache2
@@ -85,4 +85,4 @@
name: apache2
state: restarted
when:
- - inventory_hostname in groups['dashboard_containers']
+ - inventory_hostname in groups['horizon']
diff --git a/deploy/adapters/ansible/roles/post-openstack/vars/main.yml b/deploy/adapters/ansible/roles/post-openstack/vars/main.yml
index d9c36d4..ed64c8d 100644
--- a/deploy/adapters/ansible/roles/post-openstack/vars/main.yml
+++ b/deploy/adapters/ansible/roles/post-openstack/vars/main.yml
@@ -43,3 +43,7 @@ flavors:
vcpus: 8
ram: 16384
disk: 160
+
+# 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
diff --git a/deploy/adapters/ansible/roles/post-osa/vars/main.yml b/deploy/adapters/ansible/roles/post-osa/vars/main.yml
index 95f5153..f5ffa33 100644
--- a/deploy/adapters/ansible/roles/post-osa/vars/main.yml
+++ b/deploy/adapters/ansible/roles/post-osa/vars/main.yml
@@ -1,6 +1,8 @@
---
-os_ver: 16.0.5
+# yamllint disable rule:line-length
+os_ver: "{{ lookup('yamlfile', '/opt/openstack-ansible/group_vars/all/all.yml key=openstack_release') }}"
+# yamllint enable rule:line-length
os_name: pike
# yamllint disable rule:line-length