Cleanup for another release
Relax requirements to simplify installation Bumped version by version until an error appeared. I did this per dependency, so I did not take into account any incompatibilities between specific versions of dependencies. Change-Id: I59b5d386c674e628924909348a38966b76ae88dc
This commit is contained in:
Ziad Sawalha
parent
01ad34c89f
commit
a5b9c4df38
50
README.rst
50
README.rst
@ -24,13 +24,21 @@ Configuration discovery output could be used for:
|
||||
Getting Started
|
||||
===============
|
||||
|
||||
Run WITHOUT OpenStack credentials::
|
||||
Run discovery on the local system::
|
||||
|
||||
$ pip install satori
|
||||
|
||||
$ satori www.foo.com
|
||||
$ satori localhost --system-info=ohai-solo -F json
|
||||
# Installs and runs ohai-solo, outputs the data as JSON
|
||||
|
||||
|
||||
Run against a URL with OpenStack credentials::
|
||||
|
||||
$ pip install satori
|
||||
|
||||
$ satori https://www.foo.com
|
||||
Address:
|
||||
www.foo.com resolves to IPv4 address 4.4.4.4
|
||||
www.foo.com resolves to IPv4 address 192.0.2.24
|
||||
Domain: foo.com
|
||||
Registrar: TUCOWS, INC.
|
||||
Nameservers: NS1.DIGIMEDIA.COM, NS2.DIGIMEDIA.COM
|
||||
@ -38,14 +46,14 @@ Run WITHOUT OpenStack credentials::
|
||||
Host not found
|
||||
|
||||
Deeper discovery is available if the network location (IP or hostname) is
|
||||
hosted on an OpenStack cloud tenant that Satori can access.
|
||||
hosted on an OpenStack cloud tenant that Satori can access.
|
||||
|
||||
Cloud settings can be passed in on the command line or via `OpenStack tenant environment
|
||||
variables`_.
|
||||
|
||||
Run WITH OpenStack credentials::
|
||||
Run with OpenStack credentials::
|
||||
|
||||
$ satori foo.com --os-username yourname --os-password yadayadayada --os-tenant-name myproject --os-auth-url http://...
|
||||
$ satori 192.0.2.24 --os-username yourname --os-password yadayadayada --os-tenant-name myproject --os-auth-url http://...
|
||||
|
||||
Or::
|
||||
|
||||
@ -57,17 +65,9 @@ Or::
|
||||
|
||||
Notice the discovery result now contains a ``Host`` section::
|
||||
|
||||
$ satori www.foo.com
|
||||
Domain: foo.com
|
||||
Registered at TUCOWS DOMAINS INC.
|
||||
Expires in 475 days.
|
||||
Name servers:
|
||||
DNS1.STABLETRANSIT.COM
|
||||
DNS2.STABLETRANSIT.COM
|
||||
Address:
|
||||
www.foo.com resolves to IPv4 address 4.4.4.4
|
||||
$ satori 192.0.2.24 --os-username yourname --os-password yadayadayada --os-tenant-name myproject --os-auth-url http://...
|
||||
Host:
|
||||
4.4.4.4 (www.foo.com) is hosted on a Nova Instance
|
||||
192.0.2.24 is hosted on a Nova Instance
|
||||
Instance Information:
|
||||
URI: https://nova.api.somecloud.com/v2/111222/servers/d9119040-f767-414
|
||||
1-95a4-d4dbf452363a
|
||||
@ -76,7 +76,7 @@ Notice the discovery result now contains a ``Host`` section::
|
||||
ip-addresses:
|
||||
public:
|
||||
::ffff:404:404
|
||||
4.4.4.4
|
||||
192.0.2.24
|
||||
private:
|
||||
10.1.1.156
|
||||
System Information:
|
||||
@ -117,23 +117,17 @@ Unit tests can be ran simply by running::
|
||||
$ tox -e py27
|
||||
|
||||
|
||||
Running a test coverage report:
|
||||
Checking test coverage::
|
||||
|
||||
# cleanup previous runs
|
||||
$ rm -rf cover && rm -rf covhtml && rm .coverage
|
||||
# Run tests with coverage
|
||||
$ tox -ecover
|
||||
|
||||
# Run tests and generate the report
|
||||
$ tox -ecover && coverage html -d covhtml -i
|
||||
# generate the report
|
||||
$ coverage html -d covhtml -i
|
||||
|
||||
# open it in a broweser
|
||||
$ open covhtml/index.html
|
||||
|
||||
Checking test coverage::
|
||||
|
||||
$ tox -ecover
|
||||
$ coverage html -d covhtml -i
|
||||
$ open covhtml/index.html # opens the report in a browser
|
||||
|
||||
|
||||
Links
|
||||
=====
|
||||
|
||||
@ -2,6 +2,16 @@
|
||||
Release Notes
|
||||
=============
|
||||
|
||||
0.1.4 (20 Mar 2014)
|
||||
===================
|
||||
|
||||
* Data plane discovery (logs on to machines)
|
||||
* Localhost discovery
|
||||
* SSH module
|
||||
* Templated output
|
||||
* Bug fixes
|
||||
|
||||
|
||||
0.1.3 (18 Feb 2014)
|
||||
===================
|
||||
|
||||
|
||||
@ -1,10 +1,9 @@
|
||||
iso8601>=0.1.9
|
||||
Jinja2
|
||||
# python3 branch of paramiko
|
||||
https://github.com/paramiko/paramiko/archive/python3.zip#egg=paramiko-1.13.0
|
||||
iso8601>=0.1.5
|
||||
Jinja2>=2.7.1
|
||||
paramiko>=1.13.0 # py33 support
|
||||
pbr>=0.5.21,<1.0
|
||||
python-novaclient>=2.15.0
|
||||
python-novaclient>=2.15.0 # py33 support
|
||||
# pythonwhois with python 3.3 readiness patch
|
||||
-e git://github.com/ziadsawalha/python-whois.git@17aa17c1c71805df1cb7fa053fe90b6dc9ba6d4b#egg=pythonwhois
|
||||
six==1.5.2
|
||||
tldextract==1.3.1
|
||||
six>=1.4.0
|
||||
tldextract>=1.2
|
||||
|
||||
@ -1,11 +1,9 @@
|
||||
ipaddress>=1.0.6 # in stdlib as of python3.3
|
||||
iso8601>=0.1.9
|
||||
Jinja2
|
||||
# python3 branch of paramiko
|
||||
https://github.com/paramiko/paramiko/archive/python3.zip#egg=paramiko-1.13.0
|
||||
ipaddress>=1.0.6 # in stdlib as of python3.3
|
||||
iso8601>=0.1.5
|
||||
Jinja2>=2.7.1 # bug resolve @2.7.1
|
||||
paramiko>=1.12.0 # ecdsa added
|
||||
pbr>=0.5.21,<1.0
|
||||
python-novaclient>=2.6.0.1
|
||||
# pythonwhois with python 3.3 readiness patch
|
||||
-e git://github.com/ziadsawalha/python-whois.git@17aa17c1c71805df1cb7fa053fe90b6dc9ba6d4b#egg=pythonwhois
|
||||
six==1.5.2
|
||||
tldextract==1.3.1
|
||||
python-novaclient>=2.6.0.1 # breaks before
|
||||
pythonwhois>=2.0.0
|
||||
six>=1.4.0 # urllib introduced
|
||||
tldextract>=1.2
|
||||
|
||||
@ -7,11 +7,11 @@
|
||||
|
||||
coverage>=3.6
|
||||
discover
|
||||
flake8_docstrings>=0.2.0
|
||||
flake8_docstrings>=0.2.0 # patched for py33
|
||||
fixtures>=0.3.14
|
||||
freezegun
|
||||
mock>=1.0
|
||||
pep257>=0.3.2
|
||||
pep257>=0.3.2 # patched for py33
|
||||
sphinx>=1.2.2
|
||||
testrepository>=0.0.17
|
||||
testtools>=0.9.32
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user