Browse Source

Merge "Update README file" into stable/kilo

Jenkins 4 years ago
parent
commit
842541dddd
3 changed files with 17 additions and 13 deletions
  1. 3
    1
      CONTRIBUTING.rst
  2. 13
    11
      README.rst
  3. 1
    1
      setup.cfg

+ 3
- 1
CONTRIBUTING.rst View File

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

+ 13
- 11
README.rst View File

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

+ 1
- 1
setup.cfg View File

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

Loading…
Cancel
Save