openstack/charm-swift-proxy
Code Issues Proposed changes

[gnuoy,trivial] Fix charm proof warning

Browse Source
This commit is contained in:
Liam Young
2015-02-04 15:28:08 +00:00
parent a6826127bf
commit e1c03cf39a
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
config.yaml
View File

@@ -63,6 +63,7 @@ options:
# User provided SSL cert and key # User provided SSL cert and key
ssl_cert: ssl_cert:
type: string type: string
default:
description: | description: |
Base64 encoded SSL certificate to install and use for API ports. Base64 encoded SSL certificate to install and use for API ports.
. .
@@ -75,6 +76,7 @@ options:
do so). do so).
ssl_key: ssl_key:
type: string type: string
default:
description: | description: |
Base64 encoded SSL key to use with certificate specified as ssl_cert. Base64 encoded SSL key to use with certificate specified as ssl_cert.
# General Swift Proxy configuration # General Swift Proxy configuration
@@ -117,6 +119,7 @@ options:
# Manual Keystone configuration. # Manual Keystone configuration.
keystone-auth-host: keystone-auth-host:
type: string type: string
default:
description: Keystone authentication host description: Keystone authentication host
keystone-auth-port: keystone-auth-port:
default: 35357 default: 35357
@@ -132,16 +135,20 @@ options:
description: Keystone admin tenant name description: Keystone admin tenant name
keystone-admin-user: keystone-admin-user:
type: string type: string
default:
description: Keystone admin username description: Keystone admin username
keystone-admin-password: keystone-admin-password:
type: string type: string
default:
description: Keystone admin password description: Keystone admin password
# HA configuration settings # HA configuration settings
swift-hash: swift-hash:
type: string type: string
default:
description: Hash to use across all swift-proxy servers - don't loose description: Hash to use across all swift-proxy servers - don't loose
vip: vip:
type: string type: string
default:
description: | description: |
Virtual IP(s) to use to front API services in HA configuration. Virtual IP(s) to use to front API services in HA configuration.
. .
@@ -163,6 +170,7 @@ options:
# by default all access is over 'private-address' # by default all access is over 'private-address'
os-admin-network: os-admin-network:
type: string type: string
default:
description: | description: |
The IP address and netmask of the OpenStack Admin network (e.g., The IP address and netmask of the OpenStack Admin network (e.g.,
192.168.0.0/24) 192.168.0.0/24)
@@ -170,6 +178,7 @@ options:
This network will be used for admin endpoints. This network will be used for admin endpoints.
os-internal-network: os-internal-network:
type: string type: string
default:
description: | description: |
The IP address and netmask of the OpenStack Internal network (e.g., The IP address and netmask of the OpenStack Internal network (e.g.,
192.168.0.0/24) 192.168.0.0/24)
@@ -177,6 +186,7 @@ options:
This network will be used for internal endpoints. This network will be used for internal endpoints.
os-public-network: os-public-network:
type: string type: string
default:
description: | description: |
The IP address and netmask of the OpenStack Public network (e.g., The IP address and netmask of the OpenStack Public network (e.g.,
192.168.0.0/24) 192.168.0.0/24)