openstack/openstack-ansible
Code Issues Proposed changes

Adjust sample configs for Swift

Browse Source 
* Move rpc_user_config.d to conf.d
* Move the swift variables out of rpc_user_config
* Ensure the swift.yml inside conf.d is correct
This commit is contained in:
Andy McCrae 2014-10-17 17:55:29 +01:00
parent 5d6043bfeb
commit d4d78a9d3f
2 changed files with 0 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
etc/rpc_deploy/rpc_user_config.d/swift.yml → etc/rpc_deploy/conf.d/swift.yml
View File

92
etc/rpc_deploy/rpc_user_config.yml
View File

@ -109,36 +109,6 @@ global_overrides:
type: "vlan"
range: "1:1"
net_name: "vlan"
#
# Setup swift group variables when using swift (Not required if not using swift)
# part power is required under swift.
# For account/container speciying min_part_hours and repl_number is all thats required
# Alternatively defaults will be used (repl_number of 3, and min_part_hours of 1).
# For storage policies, a name and unique index is required as well as repl_number and
# min_part_hours which will be set to a default value if not specified.
# There MUST be a storage policy with index 0 configured which will be the default for legacy containers (created pre-storage policies).
# You can set one policy to be "default: yes" this will be the default storage policy for non-legacy containers that are created.
# The index value must be unique.
# Storage policies can be set to "deprecated: yes" which will mean they are not used
# swift:
# part_power: 8
# account:
# repl_number: 3
# min_part_hours: 1
# container:
# repl_number: 3
# storage_policies:
# - policy:
# name: gold
# index: 0
# repl_number: 3
# default: yes
# - policy:
# name: silver
# index: 1
# repl_number: 2
# deprecated: yes
#
# Name of load balancer
lb_name: lb_name_in_core
@ -187,65 +157,3 @@ log_hosts:
network_hosts:
network1:
ip: 172.29.236.108
# User defined Swift Proxy hosts - not required when not using swift
# Will deploy a swift-proxy container on these hosts.
# Recommend mirroring the infra_hosts
# swift-proxy_hosts:
# infra1:
# ip: 172.29.236.100
# infra2:
# ip: 172.29.236.101
# infra3:
# ip: 172.29.236.102
# User defined Object Storage Hosts - this is not a required group
# Under swift_vars you can specify the host specific swift_vars.
# region - the swift region, this isn't required.
# zone - the swift zone, this isn't required either, will default to 0
# mount_point - where the drives are mounted on the server
# drives - A list of drives in the server (Must have a name as a minimum)
# Above 4 vars are "host specific"
# weight: a disks weight (defaults to 100 if not specified)
# repl_ip: IP specific for object replication (not required)
# repl_port: Port specific for object replication (not required)
# groups: A list of groups to add the drive to. A group is either a storage policy or the account or container servers. (If not specified defaults to all groups, so container/account/all storage policies).
# The above 4 can be specified on a per host or per drive basis
# Or both, in which case "per drive" will take precedence for the specific drive.
# ip can be specified in swift_vars to override the hosts ip
# or per drive to override all for that specific drive.
# swift_hosts:
# object_storage1:
# ip: 172.29.236.108
# container_vars:
# swift_vars:
# region: 0
# zone: 0
# groups:
# - silver
# - account
# mount_point: /srv/node
# drives:
# - name: sdb
# ip: 172.10.100.100
# repl_ip: 10.10.0.1
# repl_port: 54321
# groups:
# - gold
# - account
# - container
# - name: sdc
# weight: 150
# - name: sdd
# - name: sde
#
# object_storage2:
# ip: 172.29.236.109
# container_vars:
# swift_vars:
# region: 0
# zone: 1
# mount_point: /srv/node
# drives:
# - name: sdb
# - name: sdc