openstack
/
tacker
Code Issues Proposed changes

Update Keystone auth_url in vim_config.yaml

Browse Source 
Currently, keystone_authtoken.auth_url is working at
`http://127.0.0.1/identity`, not `http://127.0.0.1:5000` as shown in
sample vim_config.yaml. So this patch aims to update the outdated
auth_url in vim_config.yaml file

Change-Id: I9e66ab5cd365c7bc70c80974fa891fc2e6ddd96f
changes/17/602517/4
Kim Bao Long 5 years ago committed by Cong Phuoc Hoang
parent fb06b7c96c
commit 9a7ce4f83c
11 changed files with 44 additions and 25 deletions
Show Stats Download Patch File Download Diff File

2
devstack/vim_config.yaml
Unescape View File

@ -1,4 +1,4 @@
auth_url: 'http://localhost:5000'
auth_url: 'http://localhost/identity'
username: 'nfv_user'
password: 'devstack'
project_name: 'nfv'

13
doc/source/install/getting_started.rst
Unescape View File

@ -32,7 +32,7 @@ is the account information collected in file `vim_config.yaml` [1]_:
.. code-block:: yaml
auth_url: 'https://10.1.0.5:5000'
auth_url: 'http://127.0.0.1/identity'
username: 'nfv_user'
password: 'mySecretPW'
project_name: 'nfv'
@ -41,6 +41,12 @@ is the account information collected in file `vim_config.yaml` [1]_:
cert_verify: 'True'
..
.. note::
In Keystone, port `5000` is enabled for authentication service [2]_, so the
end users can use `auth_url: 'http://127.0.0.1/5000/v3` instead of
`auth_url: 'http://127.0.0.1/identity'` as above mention.
By default, cert_verify is set as `True`. To disable verifying SSL
certificate, user can set cert_verify parameter to `False`.
@ -107,7 +113,7 @@ Onboarding sample VNF
.. note::
You can find more sample tosca templates for VNFD at [2]_
You can find more sample tosca templates for VNFD at [3]_
2. Create a sample VNFD
@ -138,4 +144,5 @@ References
==========
.. [1] https://github.com/longkb/tacker/blob/master/samples/vim/vim_config.yaml
.. [2] https://github.com/openstack/tacker/tree/master/samples/tosca-templates/vnfd
.. [2] https://docs.openstack.org/keystoneauth/latest/using-sessions.html#sessions-for-users
.. [3] https://github.com/openstack/tacker/tree/master/samples/tosca-templates/vnfd

17
doc/source/user/multisite_vim_usage_guide.rst
Unescape View File

@ -43,8 +43,8 @@ To register a new OpenStack VIM inside Tacker.
| Field | Value |
+----------------+----------------------------------------------------------------------------------------------------------------------------------------------------------+
| auth_cred | {"username": "nfv_user", "password": "***", "project_name": "nfv", "user_id": "", "user_domain_name": "default", "auth_url": |
| | "http://10.18.161.165:5000/v3", "project_id": "", "project_domain_name": "default"} |
| auth_url | http://10.18.161.165:5000/v3 |
| | "http://127.0.0.1/identity", "project_id": "", "project_domain_name": "default"} |
| auth_url | http://127.0.0.1/identity |
| description | OpenStack Liberty |
| id | 3f3c51c5-8bda-4bd3-adb3-5ae62eae65c3 |
| name | Site1 |
@ -58,7 +58,7 @@ In the above command, config.yaml contains VIM specific parameters as below:
::
auth_url: 'http://localhost:5000'
auth_url: 'http://127.0.0.1/identity'
username: 'nfv_user'
password: 'devstack'
project_name: 'nfv'
@ -66,6 +66,12 @@ In the above command, config.yaml contains VIM specific parameters as below:
The parameter auth_url points to the keystone service authorization URL of the
remote OpenStack site.
.. note::
In Keystone, port `5000` is enabled for authentication service [1]_, so the
end users can use `auth_url: 'http://127.0.0.1/5000/v3` instead of
`auth_url: 'http://127.0.0.1/identity'` as above mention.
Default VIM configuration
~~~~~~~~~~~~~~~~~~~~~~~~~
@ -171,3 +177,8 @@ Limitations
* Fernet keys for password encryption and decryption is stored on file systems.
This is a limitation when multiple servers are serving behind a load balancer
server and the keys need to be synced across tacker server systems.
References
==========
.. [1] https://docs.openstack.org/keystoneauth/latest/using-sessions.html#sessions-for-users

2
samples/vim/vim_config.yaml
Unescape View File

@ -1,4 +1,4 @@
auth_url: 'http://10.18.112.10:5000'
auth_url: 'http://10.18.112.10/identity'
username: 'nfv_user'
password: 'mySecretPW'
project_name: 'nfv'

2
tacker/tests/etc/samples/local-vim.yaml
Unescape View File

@ -1,4 +1,4 @@
auth_url: http://127.0.0.1:5000
auth_url: http://127.0.0.1/identity
username: nfv_user
password: devstack
project_name: nfv

6
tacker/tests/unit/api/v1/test_vim.py
Unescape View File

@ -30,7 +30,7 @@ def get_vim_config():
"vim": {
"tenant_id": 'test-project',
"type": "openstack",
"auth_url": 'http://localhost:5000',
"auth_url": 'http://localhost/identity',
"auth_cred": {
"username": "test_user",
"user_domain_name": "Default",
@ -62,7 +62,7 @@ class VIMCreateTestCase(base.TestCase):
def _vim_create_response(self):
return {
'auth_cred': {
'auth_url': 'http://localhost:5000',
'auth_url': 'http://localhost/identity',
'cert_verify': 'False',
'key_type': 'barbican_key',
'password': '***',
@ -73,7 +73,7 @@ class VIMCreateTestCase(base.TestCase):
'user_domain_name': 'Default',
'username': 'test_user'
},
'auth_url': 'http://localhost:5000',
'auth_url': 'http://localhost/identity',
'created_at': None,
'description': 'Additional site',
'id': '73493efe-3616-414c-bf87-bf450d0b3650',

5
tacker/tests/unit/db/utils.py
Unescape View File

@ -155,7 +155,8 @@ def get_dummy_vnf_update_config():
def get_vim_obj():
return {'vim': {'type': 'openstack', 'auth_url': 'http://localhost:5000',
return {'vim': {'type': 'openstack',
'auth_url': 'http://localhost/identity',
'vim_project': {'name': 'test_project'},
'auth_cred': {'username': 'test_user',
'password': 'test_password',
@ -170,7 +171,7 @@ def get_vim_auth_obj():
'project_id': None,
'project_name': 'test_project',
'cert_verify': 'True',
'auth_url': 'http://localhost:5000/v3',
'auth_url': 'http://localhost/identity/v3',
'user_domain_name': 'default',
'project_domain_name': 'default'}

2
tacker/tests/unit/nfvo/drivers/vim/test_kubernetes_driver.py
Unescape View File

@ -43,7 +43,7 @@ OPTS = [cfg.StrOpt('user_domain_id',
default='default',
help='Project Domain Name'),
cfg.StrOpt('auth_url',
default='http://localhost:5000/v3',
default='http://localhost/identity/v3',
help='Keystone endpoint')]
cfg.CONF.register_opts(OPTS, 'keystone_authtoken')

12
tacker/tests/unit/nfvo/drivers/vim/test_openstack_driver.py
Unescape View File

@ -45,7 +45,7 @@ OPTS = [cfg.StrOpt('user_domain_id',
default='default',
help='Project Domain Name'),
cfg.StrOpt('auth_url',
default='http://localhost:5000/v3',
default='http://localhost/identity/v3',
help='Keystone endpoint')]
cfg.CONF.register_opts(OPTS, 'keystone_authtoken')
@ -102,26 +102,26 @@ class TestOpenstack_Driver(base.TestCase):
def get_vim_obj(self):
return {'id': '6261579e-d6f3-49ad-8bc3-a9cb974778ff', 'type':
'openstack', 'auth_url': 'http://localhost:5000',
'openstack', 'auth_url': 'http://localhost/identity',
'auth_cred': {'username': 'test_user',
'password': 'test_password',
'user_domain_name': 'default',
'cert_verify': 'True',
'auth_url': 'http://localhost:5000'},
'auth_url': 'http://localhost/identity'},
'name': 'VIM0',
'vim_project': {'name': 'test_project',
'project_domain_name': 'default'}}
def get_vim_obj_barbican(self):
return {'id': '6261579e-d6f3-49ad-8bc3-a9cb974778ff', 'type':
'openstack', 'auth_url': 'http://localhost:5000',
'openstack', 'auth_url': 'http://localhost/identity',
'auth_cred': {'username': 'test_user',
'password': 'test_password',
'user_domain_name': 'default',
'key_type': 'barbican_key',
'secret_uuid': 'fake-secret-uuid',
'cert_verify': 'True',
'auth_url': 'http://localhost:5000'},
'auth_url': 'http://localhost/identity'},
'name': 'VIM0',
'vim_project': {'name': 'test_project',
'project_domain_name': 'default'}}
@ -150,7 +150,7 @@ class TestOpenstack_Driver(base.TestCase):
self.keystone.get_version.return_value = keystone_version
auth_obj = {'tenant_name': 'test_project', 'username': 'test_user',
'password': 'test_password', 'cert_verify': 'True',
'auth_url': 'http://localhost:5000/v2.0',
'auth_url': 'http://localhost/identity/v2.0',
'tenant_id': None}
self._test_register_vim(self.vim_obj, mock_ks_client)
self.keystone.initialize_client.assert_called_once_with(

4
tacker/tests/unit/nfvo/test_nfvo_plugin.py
Unescape View File

@ -249,7 +249,7 @@ class TestNfvoPlugin(db_base.SqlTestCase):
vim_auth_db = nfvo_db.VimAuth(
vim_id='6261579e-d6f3-49ad-8bc3-a9cb974778ff',
password='encrypted_pw',
auth_url='http://localhost:5000',
auth_url='http://localhost/identity',
vim_project={'name': 'test_project'},
auth_cred={'username': 'test_user', 'user_domain_id': 'default',
'project_domain_id': 'default',
@ -272,7 +272,7 @@ class TestNfvoPlugin(db_base.SqlTestCase):
vim_auth_db = nfvo_db.VimAuth(
vim_id='6261579e-d6f3-49ad-8bc3-a9cb974778ff',
password='encrypted_pw',
auth_url='http://localhost:5000',
auth_url='http://localhost/identity',
vim_project={'name': 'test_project'},
auth_cred={'username': 'test_user', 'user_domain_id': 'default',
'project_domain_id': 'default',

4
tacker/tests/unit/vnfm/test_plugin.py
Unescape View File

@ -94,7 +94,7 @@ class TestVNFMPlugin(db_base.SqlTestCase):
def _stub_get_vim(self):
vim_obj = {'vim_id': '6261579e-d6f3-49ad-8bc3-a9cb974778ff',
'vim_name': 'fake_vim', 'vim_auth':
{'auth_url': 'http://localhost:5000', 'password':
{'auth_url': 'http://localhost/identity', 'password':
'test_pw', 'username': 'test_user', 'project_name':
'test_project'}, 'vim_type': 'test_vim'}
self.vim_client.get_vim.return_value = vim_obj
@ -212,7 +212,7 @@ class TestVNFMPlugin(db_base.SqlTestCase):
vim_auth_db = nfvo_db.VimAuth(
vim_id='6261579e-d6f3-49ad-8bc3-a9cb974778ff',
password='encrypted_pw',
auth_url='http://localhost:5000',
auth_url='http://localhost/identity',
vim_project={'name': 'test_project'},
auth_cred={'username': 'test_user', 'user_domain_id': 'default',
'project_domain_id': 'default'})

Write Preview
Loading…
Cancel
Save