diff options
| author |   Harry Huang <huangxiangyu5@huawei.com> | 2018-03-01 16:42:06 +0800 |
|---|---|---|
| committer | Harry Huang <huangxiangyu5@huawei.com> | 2018-03-20 10:06:34 +0800 |
| commit | 9516282c82d34cad3bfc391d5204922ee4620208 (patch) | |
| tree | 9af126dd0d501ecdb582523fb00efe894a7636af /deploy/adapters/ansible/roles/post-openstack | |
| parent | 743ca540fa2c8688720d9e54142e7ae77970d842 (diff) | |
Fix workaround of image upload through horizon
1. using horizon group limit
2. set fact openstack_release to hostvars of
localhost
Change-Id: I0af0da1a508e862d0e2bb975f29897ec2948617f
Signed-off-by: Harry Huang <huangxiangyu5@huawei.com>
Diffstat (limited to 'deploy/adapters/ansible/roles/post-openstack')
| -rw-r--r-- | deploy/adapters/ansible/roles/post-openstack/tasks/main.yml | 4 | ||||
| -rw-r--r-- | deploy/adapters/ansible/roles/post-openstack/vars/main.yml | 4 |
2 files changed, 6 insertions, 2 deletions
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 |