Merge "Update README file" into stable/kilo

CONTRIBUTING.rst

@@ -19,7 +19,9 @@ Project Hosting Details
 =======================
 
 * Bug tracker
-    https://launchpad.net/murano
+    * https://launchpad.net/murano
+
+    * https://launchpad.net/python-muranoclient
 
 * Mailing list (prefix subjects with ``[Murano]`` for faster responses)
     http://lists.openstack.org/cgi-bin/mailman/listinfo/openstack-dev

README.rst

@@ -4,25 +4,27 @@ Murano Agent
 Murano Agent is a VM-side guest agent that accepts commands from Murano engine
 and executes them.
 
-Image building using dib
-------------------------
+Image building using DiskImage-Builder
+--------------------------------------
 
-contrib/elements contains
+Folder, named *contrib/elements* contains
 `diskimage-builder <https://git.openstack.org/cgit/openstack/diskimage-builder>`_
 elements to build an image which contains the Murano Agent required to use Murano.
 
-An example Ubuntu based image containing the agent can be built and uploaded
-to glance with the following commands:
+Ubuntu based image containing the agent can be built and uploaded
+to Glance with the following commands:
 
 ::
 
-  git clone https://git.openstack.org/openstack/diskimage-builder.git
-  git clone https://git.openstack.org/stackforge/murano-agent.git
-  export ELEMENTS_PATH=murano-agent/contrib/elements
-  diskimage-builder/bin/disk-image-create vm ubuntu \
+  $ git clone https://git.openstack.org/openstack/diskimage-builder.git
+  $ git clone https://git.openstack.org/openstack/murano-agent.git
+  $ export ELEMENTS_PATH=murano-agent/contrib/elements
+  $ diskimage-builder/bin/disk-image-create vm ubuntu \
     murano-agent -o ubuntu-murano-agent.qcow2
-  glance image-create --disk-format qcow2 --container-format bare \
-    --name ubuntu-murano < ubuntu-murano.qcow2
+  $ glance image-create --disk-format qcow2 --container-format bare \
+    --name ubuntu-murano --file ubuntu-murano.qcow2 \
+    --property murano_image_info='{"title": "Ubuntu for Murano", \
+    "type": "linux"}'
 
 Project Resources
 -----------------

setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = murano-agent
-version = 2015.1
+version = 2015.2
 summary = Python Murano Agent
 description-file =
     README.rst