openstack/tacker
Code Issues Proposed changes

Merge "Make Name parameter positional argument in DOCs and devstack lib"

Browse Source
This commit is contained in:
Jenkins 2016-08-24 01:38:23 +00:00 committed by Gerrit Code Review
commit d173d4019e
5 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
devstack/lib/tacker
View File

@ -399,7 +399,7 @@ function tacker_register_default_vim {
get_or_add_user_project_role "admin" $DEFAULT_VIM_USER $DEFAULT_VIM_PROJECT_NAME
get_or_add_user_project_role "advsvc" $DEFAULT_VIM_USER $DEFAULT_VIM_PROJECT_NAME
VIM_CONFIG_FILE="$TACKER_DIR/devstack/vim_config.yaml"
default_vim_id=$(tacker vim-register --is-default --name $DEFAULT_VIM_NAME --config-file $VIM_CONFIG_FILE -f value -c id)
default_vim_id=$(tacker vim-register --is-default --config-file $VIM_CONFIG_FILE $DEFAULT_VIM_NAME -f value -c id)
echo $default_vim_id
}

4
doc/source/devref/multisite_vim_usage_guide.rst
View File

@ -37,7 +37,7 @@ To register a new OpenStack VIM inside Tacker
::
$ tacker vim-register --name Site1 --description 'OpenStack Liberty' --config-file vim_config.yaml
$ tacker vim-register --description 'OpenStack Liberty' --config-file vim_config.yaml Site1
Created a new vim:
+----------------+----------------------------------------------------------------------------------------------------------------------------------------------------------+
| Field | Value |
@ -79,7 +79,7 @@ Deploying a new VNF on registered VIM
::
$ tacker vnf-create --name openwrt_VNF --description 'Openwrt VNF on Site1' --vnfd-id c3cbf0c0-a492-49e3-9541-945e49e7ed7e --vim-name Site1
$ tacker vnf-create --description 'Openwrt VNF on Site1' --vnfd-id c3cbf0c0-a492-49e3-9541-945e49e7ed7e --vim-name Site1 openwrt_VNF
Created a new vnf:
+----------------+--------------------------------------+
| Field | Value |

2
doc/source/devref/vnfd_template_parameterization.rst
View File

@ -217,7 +217,7 @@ Key Summary
- An example of a vnf-create python-tackerclient command specifying a
parameterized template and parameter values file would like below:
"tacker vnf-create --vnfd-name <vnfd_name> --param-file <param_yaml_file>
--name <vnf_name>"
<vnf_name>"
- Specifying a parameter values file during VNF creation is also supported in
Horizon UI.
- Sample VNFD parameterized templates and parameter values files can be found

4
doc/source/install/getting_started.rst
View File

@ -58,14 +58,14 @@ ii). Create a sample vnfd.
.. code-block:: console
tacker vnfd-create --name <NAME> --vnfd-file sample-vnfd.yml
tacker vnfd-create --vnfd-file sample-vnfd.yml <NAME>
..
iii). Create a VNF.
.. code-block:: console
tacker vnf-create --name <NAME> --vnfd-id <VNFD_ID>
tacker vnf-create --vnfd-id <VNFD_ID> <NAME>
..
iv). Check the status.

3
doc/source/install/manual_installation.rst
View File

@ -312,8 +312,7 @@ the user during vnf-create.
.. code-block:: console
tacker vim-register --is-default --config-file config.yaml \
--name <Default VIM name> --description <Default VIM description>
..
--description <Default VIM description> <Default VIM Name>
config.yaml will contain VIM specific parameters as below: