From 3b624d6fbf561f8a54536308122994ccd0e217c5 Mon Sep 17 00:00:00 2001
From: Adam Gandelman <adamg@canonical.com>
Date: Wed, 19 Dec 2012 14:46:22 -0800
Subject: [PATCH] Clean up, fix some typos in README.

---
 README           |  8 ++++----
 hooks/test.py    |  4 ----
 swift-proxy.yaml | 13 -------------
 3 files changed, 4 insertions(+), 21 deletions(-)
 delete mode 100644 hooks/test.py
 delete mode 100644 swift-proxy.yaml

diff --git a/README b/README
index fe0d8e4..d7fea26 100644
--- a/README
+++ b/README
@@ -30,7 +30,7 @@ settings can be left as default.
 
 a. Zone Assignment
 
-This setting determines how the charm assignes new storage nodes to storage
+This setting determines how the charm assigns new storage nodes to storage
 zones.
 
 The default, 'manual' option is suggested for production as it allows
@@ -75,7 +75,7 @@ zones to meet its minimum replica requirement, in this case 3.
 
 The other option for zone assignment is 'auto.'  In this mode, swift-proxy
 gets a relation to a single swift-storage service unit.  Each machine unit
-assinged to that service unit will be distributed evenly across zones.
+assigned to that service unit will be distributed evenly across zones.
 
     $ cat >swift.cfg <<END
     swift-proxy:
@@ -118,9 +118,9 @@ dependencies.  See Swift documentation for details.
 
 The charm may also be configured to use Keystone, either manually (via config)
 or automatically via a relation to an existing Keystone service.  The latter is
-prefered, however, if a Keystone service is desired but it is not managed by
+preferred, however, if a Keystone service is desired but it is not managed by
 Juju, the configuration for the auth token middleware can be set manually via
-the charm's config.  A relation to a Keysone server via the identity-service
+the charm's config.  A relation to a Keystone server via the identity-service
 interface is will configure swift-proxy with the appropriate credentials
 to make use of Keystone and is required for any integration with other
 OpenStack components.
diff --git a/hooks/test.py b/hooks/test.py
deleted file mode 100644
index 213c034..0000000
--- a/hooks/test.py
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/usr/bin/python
-import lib.openstack_common as openstack
-pkg = 'swift-proxy'
-print openstack.get_os_codename_package(pkg)
diff --git a/swift-proxy.yaml b/swift-proxy.yaml
deleted file mode 100644
index 9f53062..0000000
--- a/swift-proxy.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-swift-proxy:
-  # swift-core ppa to pull packages from.
-  # Valid options: trunk, milestone, distro (ubuntu archive)
-  swift-release: trunk
-  # swift ring configuration
-  partition-power: 8
-  replicas: 3
-  min-hours: 1
-  # to be used in CA cert creation
-  country: US
-  state: OR
-  locale: Portland
-  common-name: swift-proxy.yourcloud.com