diff options
| author |   Justin chi <chigang@huawei.com> | 2016-11-09 07:26:38 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2016-11-09 07:26:38 +0000 |
| commit | 5f7e61eb5419681359af3ff3e37fac2b771a5c08 (patch) | |
| tree | 11356f5a44b0bedbe3f48652628aec298db2670b /deploy/adapters/ansible/openstack_newton_xenial/roles/neutron-controller | |
| parent | 92c05616a3612dca02ccbf88dcf4c73929f15dad (diff) | |
| parent | 14c337344987857a4648ff08365b8b128a553ef8 (diff) | |
Merge "Update the API version for Openstack Newton"
Diffstat (limited to 'deploy/adapters/ansible/openstack_newton_xenial/roles/neutron-controller')
| -rw-r--r-- | deploy/adapters/ansible/openstack_newton_xenial/roles/neutron-controller/tasks/neutron_install.yml | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/deploy/adapters/ansible/openstack_newton_xenial/roles/neutron-controller/tasks/neutron_install.yml b/deploy/adapters/ansible/openstack_newton_xenial/roles/neutron-controller/tasks/neutron_install.yml index 0a30af7a..917a8356 100644 --- a/deploy/adapters/ansible/openstack_newton_xenial/roles/neutron-controller/tasks/neutron_install.yml +++ b/deploy/adapters/ansible/openstack_newton_xenial/roles/neutron-controller/tasks/neutron_install.yml @@ -31,12 +31,9 @@ with_items: services | union(services_noarch) - name: get tenant id to fill neutron.conf - shell: openstack project show \ - --os-username=admin \ - --os-password=console \ - --os-auth-url=http://{{ internal_vip.ip }}:35357/v2.0 \ - --os-tenant-name=admin \ - service | grep id | awk '{print $4}' + shell: + . /opt/admin-openrc.sh; + openstack project show service | grep id | sed -n "2,1p" | awk '{print $4}' register: NOVA_ADMIN_TENANT_ID - name: update neutron conf |