diff options
| author |   Harry Huang <huangxiangyu5@huawei.com> | 2018-05-10 08:46:11 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-05-10 08:46:11 +0000 |
| commit | 729a1cc3924f0fb33e00bfebe1f7bfda05606578 (patch) | |
| tree | a81e0cbfec8cde8afd69a9043a362b7a84b6465f /plugins | |
| parent | aedfece7bd93b01e58ce51248c437ee9e2565f51 (diff) | |
| parent | 1f9ff3030c19d60cb6c639cde8b394994da892f0 (diff) | |
Merge "Upgrade OpenStack version from Pike to Queens"
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, 4 insertions, 4 deletions
diff --git a/plugins/odl_cluster/roles/setup-odl/vars/main.yml b/plugins/odl_cluster/roles/setup-odl/vars/main.yml index 5f4047c9..c4723e9c 100755 --- a/plugins/odl_cluster/roles/setup-odl/vars/main.yml +++ b/plugins/odl_cluster/roles/setup-odl/vars/main.yml @@ -10,9 +10,9 @@ openstack_passwd_file: /etc/openstack_deploy/user_secrets.yml # yamllint disable rule:line-length -os_ver: "{{ lookup('yamlfile', '/opt/openstack-ansible/group_vars/all/all.yml key=openstack_release') }}" +os_ver: "{{ lookup('yamlfile', '/opt/openstack-ansible/inventory/group_vars/all/all.yml key=openstack_release') }}" # yamllint enable rule:line-length -os_name: pike +os_name: queens odl_username: admin 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 2ffcac10..bc870277 100755 --- a/plugins/odl_sfc/roles/setup-odl-sfc/vars/main.yml +++ b/plugins/odl_sfc/roles/setup-odl-sfc/vars/main.yml @@ -10,9 +10,9 @@ openstack_passwd_file: /etc/openstack_deploy/user_secrets.yml # yamllint disable rule:line-length -os_ver: "{{ lookup('yamlfile', '/opt/openstack-ansible/group_vars/all/all.yml key=openstack_release') }}" +os_ver: "{{ lookup('yamlfile', '/opt/openstack-ansible/inventory/group_vars/all/all.yml key=openstack_release') }}" # yamllint enable rule:line-length -os_name: pike +os_name: queens odl_username: admin odl_password: admin |