Permalink
Browse files

switched 'argparse' to 'argh'; renamed vc commands: 'commit'->'checkp…

…oint', 'status'->'diff'
  • Loading branch information...
1 parent 02fcf71 commit 14e8ccbb50e9e17b95a2f2a0d2cd0af5d90ca22b @melor melor committed Dec 4, 2010
Showing with 286 additions and 335 deletions.
  1. +13 −8 README.rst
  2. +4 −8 examples/puppet/inst-puppet.sh
  3. +1 −1 poni/core.py
  4. +266 −316 poni/tool.py
  5. +1 −1 setup.py
  6. +1 −1 tests/test_cmd_basic.py
View
@@ -48,18 +48,23 @@ Installation
NOTE: during installation the following packages and their dependencies are
automatically installed from PyPI_:
-* paramiko_ (SSH)
-* boto_ (`Amazon EC2`_)
* `path.py`_ (directory and file management)
-* argparse_ (command-line argument parsing)
-* cheetah_ (template language)
+* Cheetah_ (template language)
+* Argh_ (command-line argument parsing)
+
+Installing the following Python libraries will add optional functionality:
+
+* Paramiko_ (Remote node control using SSH)
+* GitPython_ (Version controlling the repository with Git)
+* Boto_ (`Amazon EC2`_ virtual machine provisioning)
.. _`Amazon EC2`: http://aws.amazon.com/ec2/
-.. _paramiko: http://pypi.python.org/pypi/paramiko
-.. _boto: http://pypi.python.org/pypi/boto
+.. _Paramiko: http://pypi.python.org/pypi/paramiko
+.. _Boto: http://pypi.python.org/pypi/boto
.. _`path.py`: http://pypi.python.org/pypi/path.py
-.. _argparse: http://pypi.python.org/pypi/argparse
-.. _cheetah: http://pypi.python.org/pypi/Cheetah
+.. _Argh: http://pypi.python.org/pypi/argh
+.. _GitPython: http://pypi.python.org/pypi/GitPython
+.. _Cheetah: http://pypi.python.org/pypi/Cheetah
Installation steps
------------------
@@ -2,7 +2,7 @@
set -e
-AWS_KEYPAIR="mel-aws-us-east-1-mac"
+AWS_KEYPAIR="aws-mel-fsc"
REPO="$HOME/tmp/puppet"
rm -rf $REPO
@@ -13,16 +13,12 @@ vc init
add-config -cd ec2-deb6/ template/ec2-deb6 hacks
set template\$ verify=bool:false
-vc commit "added templates"
-
-add-node blah
-add-config blah hacks -i template/ec2-deb6/hacks
-add-node foobar -i blah
+vc checkpoint "added templates"
add-config -cd puppet-master/ software puppet-master-v1.0
add-config -cd puppet-agent/ software puppet-agent-v1.0
set software\$ verify=bool:false
-vc commit "added software"
+vc checkpoint "added software"
add-node puppet/master -i template/ec2-deb6
add-config puppet/master puppet-master -i software/puppet-master-v1.0
@@ -31,7 +27,7 @@ set puppet/master cloud.provider=aws-ec2 cloud.region=us-east-1 cloud.image=ami-
add-node nodes/demo/server{id:02} -n2 -i template/ec2-deb6
add-config nodes/demo/server puppet-agent -i software/puppet-agent-v1.0
set nodes/demo/server cloud.provider=aws-ec2 cloud.region=us-east-1 cloud.image=ami-daf615b3 cloud.kernel=aki-6eaa4907 cloud.ramdisk=ari-42b95a2b cloud.type=m1.small cloud.key-pair=$AWS_KEYPAIR user=root
-vc commit "added nodes"
+vc checkpoint "added nodes"
EOF
View
@@ -272,7 +272,7 @@ def __init__(self, system, name, system_path, sub_count, extra=None):
class ConfigMan:
def __init__(self, root_dir, must_exist=True):
# TODO: check repo.json from dir, option to start verification
- self.root_dir = root_dir
+ self.root_dir = path(root_dir)
self.system_root = self.root_dir / "system"
self.config_path = self.root_dir / REPO_CONF_FILE
self.node_cache = {}
Oops, something went wrong.

0 comments on commit 14e8ccb

Please sign in to comment.