diff --git a/doc/source/devref/multisite_vim_usage_guide.rst b/doc/source/devref/multisite_vim_usage_guide.rst index c51294f2f..9812a6396 100644 --- a/doc/source/devref/multisite_vim_usage_guide.rst +++ b/doc/source/devref/multisite_vim_usage_guide.rst @@ -68,10 +68,9 @@ remote OpenStack site. Default VIM configuration ~~~~~~~~~~~~~~~~~~~~~~~~~ -The default vim needs to be registered and added to tacker.conf under -'nfvo_vim' section. This is required when the optional argument -vim-id -is not provided during vnf-create. Refer to steps described in -`manual installation`_ to add it into tacker.conf. +The default vim needs to be registered. This is required when the optional +argument -vim-id is not provided during vnf-create. Refer to steps described in +`manual installation`_ to register default vim. .. _manual installation: http://docs.openstack.org/developer/tacker/install/manual_installation.html#registering-default-vim @@ -98,8 +97,9 @@ Deploying a new VNF on registered VIM +----------------+--------------------------------------+ The --vim-id/--vim-name argument is optional during vnf-create. If ---vim-id/--vim-name is not specified, the 'default_vim' key in tacker.conf will -be used to deploy VNF on the default site. +--vim-id/--vim-name is not specified, the default vim will +be used to deploy VNF on the default site. We can create default vim +by specifying --is-default option with vim-register command. User can optionally provide --vim-region-name during vnf-create to deploy the VNF in a specify region within that VIM. diff --git a/doc/source/install/manual_installation.rst b/doc/source/install/manual_installation.rst index 1934e29af..0dff7085e 100644 --- a/doc/source/install/manual_installation.rst +++ b/doc/source/install/manual_installation.rst @@ -305,34 +305,32 @@ required because the console will be locked by a running process. Registering default VIM ======================= -1). Register the VIM that will be used as a default VIM for VNF deployments. +Register the VIM that will be used as a default VIM for VNF deployments. This will be required when the optional argument --vim-id is not provided by the user during vnf-create. .. code-block:: console - tacker vim-register --config-file config.yaml --name - --description + tacker vim-register --is-default --config-file config.yaml \ + --name --description .. config.yaml will contain VIM specific parameters as below: .. code-block:: ini - auth_url: http://:5000 + auth_url: http://:5000 username: password: project_name: -.. note:: - Here username must point to the user having 'admin' and 'advsvc' role on the - project that will be used for deploying VNFs. - -2). Add the VIM name registered in step 1 in /etc/tacker/tacker.conf under -[nfvo_vim] section: +Add following parameters to config.yaml if VIM is using keystone v3: .. code-block:: ini - default_vim = + project_domain_name: + user_domain_name: -3). Restart tacker server +.. note:: + Here username must point to the user having 'admin' and 'advsvc' role on the + project that will be used for deploying VNFs.