diff options
| author |   Yifei Xue <xueyifei@huawei.com> | 2018-03-20 08:48:52 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-03-20 08:48:52 +0000 |
| commit | 5663222a6ca1de03a28a4d1f85f827b81b91439f (patch) | |
| tree | 27d317136f091e2d47de4f5382cff33543972223 /deploy/adapters | |
| parent | d070198fbe5756e1f5a969c05a940a3a01b74a21 (diff) | |
| parent | 9516282c82d34cad3bfc391d5204922ee4620208 (diff) | |
Merge "Fix workaround of image upload through horizon"
Diffstat (limited to 'deploy/adapters')
6 files changed, 10 insertions, 20 deletions
diff --git a/deploy/adapters/ansible/openstack/HA-ansible-multinodes.yml b/deploy/adapters/ansible/openstack/HA-ansible-multinodes.yml index 6ea57c04..c14f958e 100644 --- a/deploy/adapters/ansible/openstack/HA-ansible-multinodes.yml +++ b/deploy/adapters/ansible/openstack/HA-ansible-multinodes.yml @@ -106,6 +106,7 @@ - hosts: - utility_all[0] - network_hosts[0] + - horizon remote_user: root roles: - post-openstack diff --git a/deploy/adapters/ansible/roles/config-osa/tasks/main.yml b/deploy/adapters/ansible/roles/config-osa/tasks/main.yml index 5f4f2fb2..74d930e2 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 c886eabf..00000000 --- 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 d5582391..0bd9aeff 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 d9c36d42..ed64c8db 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 95f51530..f5ffa335 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 |