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 /plugins | |
| parent | d070198fbe5756e1f5a969c05a940a3a01b74a21 (diff) | |
| parent | 9516282c82d34cad3bfc391d5204922ee4620208 (diff) | |
Merge "Fix workaround of image upload through horizon"
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 |