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 /plugins | |
| 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 'plugins')
| -rwxr-xr-x | plugins/odl_cluster/roles/setup-odl/vars/main.yml | 4 | ||||
| -rwxr-xr-x | plugins/odl_sfc/roles/setup-odl-sfc/vars/main.yml | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/plugins/odl_cluster/roles/setup-odl/vars/main.yml b/plugins/odl_cluster/roles/setup-odl/vars/main.yml index 05ad98f5..5f4047c9 100755 --- a/plugins/odl_cluster/roles/setup-odl/vars/main.yml +++ b/plugins/odl_cluster/roles/setup-odl/vars/main.yml @@ -9,7 +9,9 @@ --- openstack_passwd_file: /etc/openstack_deploy/user_secrets.yml -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 diff --git a/plugins/odl_sfc/roles/setup-odl-sfc/vars/main.yml b/plugins/odl_sfc/roles/setup-odl-sfc/vars/main.yml index 014fc5b8..2ffcac10 100755 --- a/plugins/odl_sfc/roles/setup-odl-sfc/vars/main.yml +++ b/plugins/odl_sfc/roles/setup-odl-sfc/vars/main.yml @@ -9,7 +9,9 @@ --- openstack_passwd_file: /etc/openstack_deploy/user_secrets.yml -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 odl_username: admin |