tacker: updating the tacker section of documentation

Signed-off-by: Paul Vaduva <Paul.Vaduva@enea.com>

1 files changed, 22 insertions, 37 deletions

diff --git a/book-enea-nfv-core-installation-guide/doc/tacker.xml b/book-enea-nfv-core-installation-guide/doc/tacker.xml
index b8d6e6f..e1791db 100644
--- a/book-enea-nfv-core-installation-guide/doc/tacker.xml
+++ b/book-enea-nfv-core-installation-guide/doc/tacker.xml
@@ -28,13 +28,13 @@
         will create a hosts file for ansible
         <literal>/etc/ansible/hosts</literal> of the form:<programlisting>**********
 [controllers]
-node-3 mac_addr+68:05:ca:46:8b:64 ipmi_ip=0.0.0.0 ipmi_user=****** ipmi_pass=******
+node-5 mac_addr+68:05:ca:46:8b:64 ipmi_ip=0.0.0.0 ipmi_user=****** ipmi_pass=******
 node-2 mac_addr+68:05:ca:46:8c:d4 ipmi_ip=0.0.0.0 ipmi_user=****** ipmi_pass=******
 node-1 mac_addr+68:05:ca:46:8c:45 ipmi_ip=0.0.0.0 ipmi_user=****** ipmi_pass=******
 [main_cont]
-node-3
+node-5
 [computes]
-node-5 mac_addr+68:05:ca:46:8c:c9 ipmi_ip=0.0.0.0 ipmi_user=****** ipmi_pass=******
+node-3 mac_addr+68:05:ca:46:8c:c9 ipmi_ip=0.0.0.0 ipmi_user=****** ipmi_pass=******
 node-4 mac_addr+68:05:ca:46:8c:c2 ipmi_ip=0.0.0.0 ipmi_user=****** ipmi_pass=******
 [nodes:children]
 controllers
@@ -46,7 +46,7 @@ computes
         <para>Use your favorite text editor to manually edit
         <literal>ipmi_ip</literal> with the ip address of the ipmi interface,
         <literal>ipmi_user</literal> with the user for accessing the ipmi
-        interface, and <literal>ipmi_psss</literal> with the password used by
+        interface, and <literal>ipmi_pass</literal> with the password used by
         the user to access the ipmi interface for all the nodes.</para>
       </listitem>
 
@@ -66,8 +66,12 @@ computes
     <orderedlist>
       <listitem>
         <para>Log in using SSH to the controller node where Tacker has been
-        installed (Example here node-5) and authenticate with
-        openstack:</para>
+        installed (Example here <literal>node-5</literal>) and authenticate
+        with openstack:</para>
+
+        <para>The controller where tacker has been installed is the one under
+        [<filename>main_cont</filename>] category in file
+        <literal>/etc/ansible/hosts</literal></para>
 
         <programlisting>[root@fuel ~]# ssh node-5
 root@node-5:~# . openrc</programlisting>
@@ -82,28 +86,8 @@ root@node-5:~# . openrc</programlisting>
       </listitem>
 
       <listitem>
-        <para>Register a default VIM:</para>
-
-        <programlisting>(tacker_venv) root@node-5:~# tacker vim-register --is-default --config-file
-testvim.yaml --description 'Default VIM' defaultVim</programlisting>
-
-        <para>The sample .yaml file has the following contents</para>
-
-        <programlisting>auth_url: '&lt;keystone-auth_url&gt;'
-username: 'admin'
-password: '&lt;password&gt;'
-project_name: 'admin'
-project_domain_name: 'Default'
-user_domain_name: 'Default'
-</programlisting>
-      </listitem>
-
-      <listitem>
-        <para>Define a VNF Descriptor (VNFD):</para>
-
-        <programlisting>(tacker_venv) root@node-5:~# tacker vnfd-create --vnfd-file testvnf.yaml TestVNF</programlisting>
-
-        <para>The sample .yaml file has the following contents:</para>
+        <para>Create <filename>testvnf.yaml</filename> file with the following
+        contents:</para>
 
         <programlisting>tosca_definitions_version: tosca_simple_profile_for_nfv_1_0_0
 
@@ -125,7 +109,7 @@ topology_template:
             disk_size: 1 GB
       properties:
         image: TestVM
-        flavor: m1.tiny
+        flavor: m1.micro
         availability_zone: nova
         mgmt_driver: noop
         metadata: {metering.vnf: VDU1}
@@ -184,6 +168,10 @@ topology_template:
                     op: eq
                 metadata: VDU1
                 actions: [respawn]</programlisting>
+
+        <para>Define a VNF Descriptor (VNFD):</para>
+
+        <programlisting>(tacker_venv) root@node-5:~# tacker vnfd-create --vnfd-file testvnf.yaml TestVNF</programlisting>
       </listitem>
 
       <listitem>
@@ -195,18 +183,15 @@ topology_template:
       <listitem>
         <para>Verify:</para>
 
-        <programlisting>(tacker_venv) root@node-5:~# tacker vnf-list</programlisting>
-
-        <programlisting>+------------+---------+-----------------------+--------+----------+-----------+
+        <programlisting>(tacker_venv) root@node-5:~# tacker vnf-list
++------------+---------+-----------------------+--------+----------+-----------+
 | id         | name    | mgmt_url              | status | vim_id   | vnfd_id   |
 +------------+---------+-----------------------+--------+----------+-----------+
 | &lt;VNF-UUID&gt; | someVnf | {"VDU1": "&lt;MGMT-IP&gt;"} | ACTIVE | &lt;VIM-ID&gt; | &lt;VNFD-ID&gt; |
-+------------+---------+-----------------------+--------+----------+-----------+
-</programlisting>
++------------+---------+-----------------------+--------+----------+-----------+</programlisting>
 
-        <programlisting> root@node-5:~# nova list</programlisting>
-
-        <programlisting>+-----------+---------------+--------+------------+-------------+
+        <programlisting>root@node-5:~# nova list
++-----------+---------------+--------+------------+-------------+
 | ID        | Name          | Status | Task State | Power State |
 +-----------+---------------+--------+------------+-------------+
 | &lt;VM-UUID&gt; | ta-&lt;NAME&gt;     | ACTIVE | -          | Running     |