Clean up, fix some typos in README.
This commit is contained in:
		
							
								
								
									
										8
									
								
								README
									
									
									
									
									
								
							
							
						
						
									
										8
									
								
								README
									
									
									
									
									
								
							@@ -30,7 +30,7 @@ settings can be left as default.
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
a. Zone Assignment
 | 
					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.
 | 
					zones.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
The default, 'manual' option is suggested for production as it allows
 | 
					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
 | 
					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
 | 
					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
 | 
					    $ cat >swift.cfg <<END
 | 
				
			||||||
    swift-proxy:
 | 
					    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)
 | 
					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
 | 
					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
 | 
					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
 | 
					interface is will configure swift-proxy with the appropriate credentials
 | 
				
			||||||
to make use of Keystone and is required for any integration with other
 | 
					to make use of Keystone and is required for any integration with other
 | 
				
			||||||
OpenStack components.
 | 
					OpenStack components.
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1,4 +0,0 @@
 | 
				
			|||||||
#!/usr/bin/python
 | 
					 | 
				
			||||||
import lib.openstack_common as openstack
 | 
					 | 
				
			||||||
pkg = 'swift-proxy'
 | 
					 | 
				
			||||||
print openstack.get_os_codename_package(pkg)
 | 
					 | 
				
			||||||
@@ -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
 | 
					 | 
				
			||||||
		Reference in New Issue
	
	Block a user