Merge pull request #21 from dizz/master

Minor change to directory creation & Formatting changes
This commit is contained in:
tmetsch
2012-07-04 01:53:27 -07:00
2 changed files with 8 additions and 8 deletions

View File

@@ -1,17 +1,19 @@
occi-os occi-os
======= =======
This is a clone of https://github.com/dizz/nova - it provides a python egg which can be deployed in OpenStack and will thereby add the 3rd party OCCI interface to OpenStack. This is a clone and continuation of https://github.com/dizz/nova - it provides a python egg which can be easily
deployed in [OpenStack](http://www.openstack.org) and will thereby add the 3rd party [OCCI](http://www.occi-wg.org)
interface to OpenStack.
Usage Usage
----- -----
1. Install this egg: python setup.py install (later maybe pip install occi-os) 1. Install this egg: `python setup.py install` (later maybe `pip install occi-os`)
2. Configure OpenStack - Add application to api-paste of nova and enable the API 2. Configure OpenStack - Add application to `api-paste.ini` of nova and enable the API
### Configuration ### Configuration
Make sure an application is configured in api-paste.ini (name can be picked yourself): Make sure an application is configured in `api-paste.ini` (name can be picked yourself):
######## ########
# OCCI # # OCCI #
@@ -29,7 +31,7 @@ Make sure an application is configured in api-paste.ini (name can be picked your
[app:occiapp] [app:occiapp]
use = egg:openstackocci#occi_app use = egg:openstackocci#occi_app
Make sure the API (name from above) is enabled in nova.conf: Make sure the API (name from above) is enabled in `nova.conf`:
[...] [...]
enabled_apis=ec2,occiapi,osapi_compute,osapi_volume,metadata enabled_apis=ec2,occiapi,osapi_compute,osapi_volume,metadata
@@ -42,4 +44,3 @@ You can set the port option via the `nova.conf` configuration file:
[...] [...]
occiapi_listen_port=9999 occiapi_listen_port=9999
[...] [...]

View File

@@ -1,8 +1,7 @@
#!/bin/sh #!/bin/sh
rm -rf build/html rm -rf build/html
mkdir build mkdir -p build/html
mkdir build/html
echo '\n PyLint report \n****************************************\n' echo '\n PyLint report \n****************************************\n'