fixes in documenation
diff --git a/nova/meta/sphinx.yml b/nova/meta/sphinx.yml
index dbb7a6a..7e09e65 100644
--- a/nova/meta/sphinx.yml
+++ b/nova/meta/sphinx.yml
@@ -30,7 +30,7 @@
value: {{ compute.glance.host }}:{{ compute.glance.port }}
message_queue_ip:
name: "Message queue"
- value: {{ compute.message_queue.user }}@{{ compute.message_queue.host }}:{{ compute.message_queue.port }}/{{ compute.message_queue.virtual_host }}
+ value: {{ compute.message_queue.user }}@{{ compute.message_queue.host }}:{{ compute.message_queue.port }}{{ compute.message_queue.virtual_host }}
identity_host:
name: "Identity host ip"
value: {{ compute.identity.user }}@{{ compute.identity.host }}:{{ compute.identity.port }}
@@ -47,7 +47,8 @@
packages:
value: |
{%- for pkg in compute.pkgs %}
- * {{ pkg }}: {{ salt['cmd.run']("dpkg -l | grep "+pkg+" | awk '{print \$3}'")}}
+ {%- set pkg_version = "dpkg -l "+pkg+" | grep "+pkg+" | awk '{print $3}'" %}
+ * {{ pkg }}: {{ salt['cmd.run'](pkg_version) }}
{%- endfor %}
{%- endif %}
{%- if pillar.nova.controller is defined %}
@@ -84,7 +85,7 @@
value: {{ controller.glance.host }}:{{ controller.glance.port }}
message_queue_ip:
name: "Message queue"
- value: {{ controller.message_queue.user }}@{{ controller.message_queue.host }}:{{ controller.message_queue.port }}/{{ controller.message_queue.virtual_host }}
+ value: {{ controller.message_queue.user }}@{{ controller.message_queue.host }}:{{ controller.message_queue.port }}{{ controller.message_queue.virtual_host }}
identity_host:
name: "Identity host ip"
value: {{ controller.identity.user }}@{{ controller.identity.host }}:{{ controller.identity.port }}