Merge "Implement Swift Containers"

1 files changed, 115 insertions, 5 deletions

diff --git a/tools/genenv b/tools/genenv
index bcb1d1f72..7161d2d1d 100755..100644
--- a/tools/genenv
+++ b/tools/genenv
@@ -300,10 +300,65 @@ NOVA_VNCSERVER_PROXYCLIENT_ADDRESS=$HOST_IP
 # Nova/Neutron
 NEUTRON_SHARED_SECRET=sharedsecret
 
-#Swift
-SWIFT_DB_NAME=swift
-SWIFT_DB_USER=swift
+# Swift
+SWIFT_ACCOUNT_SVC_BIND_IP=$PUBLIC_IP
+SWIFT_ACCOUNT_SVC_BIND_PORT=6002
+SWIFT_ACCOUNT_SVC_DEVICES=/srv/node
+SWIFT_ACCOUNT_SVC_MOUNT_CHECK=false
+SWIFT_ADMIN_USER=swift
+SWIFT_API_SERVICE_HOST=$HOST_IP
+SWIFT_CONTAINER_SVC_BIND_IP=$PUBLIC_IP
+SWIFT_CONTAINER_SVC_BIND_PORT=6001
+SWIFT_CONTAINER_SVC_DEVICES=/srv/node
+SWIFT_CONTAINER_SVC_MOUNT_CHECK=false
+SWIFT_DIR=/etc/swift
+SWIFT_HASH_PATH_SUFFIX=$(openssl rand -hex 8)
+SWIFT_KEYSTONE_PASSWORD=swift
 SWIFT_KEYSTONE_USER=swift
+SWIFT_OBJECT_SVC_BIND_IP=$PUBLIC_IP
+SWIFT_OBJECT_SVC_BIND_PORT=6000
+SWIFT_OBJECT_SVC_DEVICES=/srv/node
+SWIFT_OBJECT_SVC_MOUNT_CHECK=false
+SWIFT_OBJECT_SVC_PIPELINE=object-server
+SWIFT_PROXY_ACCOUNT_AUTOCREATE=true
+SWIFT_PROXY_AUTH_PLUGIN=password
+SWIFT_PROXY_BIND_IP=$PUBLIC_IP
+SWIFT_PROXY_BIND_PORT=8080
+SWIFT_PROXY_DELAY_AUTH_DECISION=true
+SWIFT_PROXY_DIR=/etc/swift
+SWIFT_PROXY_OPERATOR_ROLES=admin,user
+SWIFT_PROXY_PASSWORD=swift
+SWIFT_PROXY_PIPELINE_MAIN="catch_errors gatekeeper healthcheck cache container_sync bulk ratelimit authtoken keystoneauth slo dlo proxy-server"
+SWIFT_PROXY_PROJECT_DOMAIN_ID=default
+SWIFT_PROXY_PROJECT_NAME=service
+SWIFT_PROXY_SIGNING_DIR=/var/cache/swift
+SWIFT_PROXY_USER_DOMAIN_ID=default
+SWIFT_PROXY_USERNAME=swift
+SWIFT_USER=swift
+SWIFT_OBJECT_SVC_RING_NAME=/etc/swift/object.builder
+SWIFT_OBJECT_SVC_RING_PART_POWER=10
+SWIFT_OBJECT_SVC_RING_REPLICAS=3
+SWIFT_OBJECT_SVC_RING_MIN_PART_HOURS=1
+SWIFT_OBJECT_SVC_RING_HOSTS="${HOST_IP}:6000,${HOST_IP}:6000,${HOST_IP}:6000"
+SWIFT_OBJECT_SVC_RING_DEVICES="sdb1,sdb2,sdb3"
+SWIFT_OBJECT_SVC_RING_WEIGHTS="1,1,1"
+SWIFT_OBJECT_SVC_RING_ZONES="1,2,3"
+SWIFT_CONTAINER_SVC_RING_NAME=/etc/swift/container.builder
+SWIFT_CONTAINER_SVC_RING_PART_POWER=10
+SWIFT_CONTAINER_SVC_RING_REPLICAS=3
+SWIFT_CONTAINER_SVC_RING_MIN_PART_HOURS=1
+SWIFT_CONTAINER_SVC_RING_HOSTS="${HOST_IP}:6001,${HOST_IP}:6001,${HOST_IP}:6001"
+SWIFT_CONTAINER_SVC_RING_DEVICES="sdb1,sdb2,sdb3"
+SWIFT_CONTAINER_SVC_RING_WEIGHTS="1,1,1"
+SWIFT_CONTAINER_SVC_RING_ZONES="1,2,3"
+SWIFT_ACCOUNT_SVC_RING_NAME=/etc/swift/account.builder
+SWIFT_ACCOUNT_SVC_RING_PART_POWER=10
+SWIFT_ACCOUNT_SVC_RING_REPLICAS=3
+SWIFT_ACCOUNT_SVC_RING_MIN_PART_HOURS=1
+SWIFT_ACCOUNT_SVC_RING_HOSTS="${HOST_IP}:6002,${HOST_IP}:6002,${HOST_IP}:6002"
+SWIFT_ACCOUNT_SVC_RING_DEVICES="sdb1,sdb2,sdb3"
+SWIFT_ACCOUNT_SVC_RING_WEIGHTS="1,1,1"
+SWIFT_ACCOUNT_SVC_RING_ZONES="1,2,3"
 
 #Zaqar
 ZAQAR_KEYSTONE_USER=zaqar
@@ -500,9 +555,64 @@ RABBITMQ_USER=$RABBIT_USER
 RABBIT_PASSWORD=$RABBIT_PASSWORD
 RABBIT_USERID=$RABBIT_USER
 ROOT_HELPER=$ROOT_HELPER
-SWIFT_DB_NAME=$SWIFT_DB_NAME
-SWIFT_DB_USER=$SWIFT_DB_USER
+SWIFT_ACCOUNT_SVC_BIND_IP=$SWIFT_ACCOUNT_SVC_BIND_IP
+SWIFT_ACCOUNT_SVC_BIND_PORT=$SWIFT_ACCOUNT_SVC_BIND_PORT
+SWIFT_ACCOUNT_SVC_DEVICES=$SWIFT_ACCOUNT_SVC_DEVICES
+SWIFT_ACCOUNT_SVC_MOUNT_CHECK=$SWIFT_ACCOUNT_SVC_MOUNT_CHECK
+SWIFT_ADMIN_USER=$SWIFT_ADMIN_USER
+SWIFT_API_SERVICE_HOST=$SWIFT_API_SERVICE_HOST
+SWIFT_CONTAINER_SVC_BIND_IP=$PUBLIC_IP
+SWIFT_CONTAINER_SVC_BIND_PORT=$SWIFT_CONTAINER_SVC_BIND_PORT
+SWIFT_CONTAINER_SVC_DEVICES=$SWIFT_CONTAINER_SVC_DEVICES
+SWIFT_CONTAINER_SVC_MOUNT_CHECK=$SWIFT_CONTAINER_SVC_MOUNT_CHECK
+SWIFT_DIR=$SWIFT_DIR
+SWIFT_HASH_PATH_SUFFIX=$SWIFT_HASH_PATH_SUFFIX
+SWIFT_KEYSTONE_PASSWORD=$SWIFT_KEYSTONE_PASSWORD
 SWIFT_KEYSTONE_USER=$SWIFT_KEYSTONE_USER
+SWIFT_OBJECT_SVC_BIND_IP=$SWIFT_OBJECT_SVC_BIND_IP
+SWIFT_OBJECT_SVC_BIND_PORT=$SWIFT_OBJECT_SVC_BIND_PORT
+SWIFT_OBJECT_SVC_DEVICES=$SWIFT_OBJECT_SVC_DEVICES
+SWIFT_OBJECT_SVC_MOUNT_CHECK=$SWIFT_OBJECT_SVC_MOUNT_CHECK
+SWIFT_OBJECT_SVC_PIPELINE=$SWIFT_OBJECT_SVC_PIPELINE
+SWIFT_PROXY_ACCOUNT_AUTOCREATE=$SWIFT_PROXY_ACCOUNT_AUTOCREATE
+SWIFT_PROXY_AUTH_PLUGIN=$SWIFT_PROXY_AUTH_PLUGIN
+SWIFT_PROXY_BIND_IP=$SWIFT_PROXY_BIND_IP
+SWIFT_PROXY_BIND_PORT=$SWIFT_PROXY_BIND_PORT
+SWIFT_PROXY_DELAY_AUTH_DECISION=$SWIFT_PROXY_DELAY_AUTH_DECISION
+SWIFT_PROXY_DIR=$SWIFT_PROXY_DIR
+SWIFT_PROXY_OPERATOR_ROLES=$SWIFT_PROXY_OPERATOR_ROLES
+SWIFT_PROXY_PASSWORD=$SWIFT_PROXY_PASSWORD
+SWIFT_PROXY_PIPELINE_MAIN=$SWIFT_PROXY_PIPELINE_MAIN
+SWIFT_PROXY_PROJECT_DOMAIN_ID=$SWIFT_PROXY_PROJECT_DOMAIN_ID
+SWIFT_PROXY_PROJECT_NAME=$SWIFT_PROXY_PROJECT_NAME
+SWIFT_PROXY_SIGNING_DIR=$SWIFT_PROXY_SIGNING_DIR
+SWIFT_PROXY_USER_DOMAIN_ID=$SWIFT_PROXY_USER_DOMAIN_ID
+SWIFT_PROXY_USERNAME=$SWIFT_PROXY_USERNAME
+SWIFT_USER=$SWIFT_USER
+SWIFT_OBJECT_SVC_RING_NAME=${SWIFT_OBJECT_SVC_RING_NAME}
+SWIFT_OBJECT_SVC_RING_PART_POWER=${SWIFT_OBJECT_SVC_RING_PART_POWER}
+SWIFT_OBJECT_SVC_RING_REPLICAS=${SWIFT_OBJECT_SVC_RING_REPLICAS}
+SWIFT_OBJECT_SVC_RING_MIN_PART_HOURS=${SWIFT_OBJECT_SVC_RING_MIN_PART_HOURS}
+SWIFT_OBJECT_SVC_RING_HOSTS=${SWIFT_OBJECT_SVC_RING_HOSTS}
+SWIFT_OBJECT_SVC_RING_DEVICES=${SWIFT_OBJECT_SVC_RING_DEVICES}
+SWIFT_OBJECT_SVC_RING_WEIGHTS=${SWIFT_OBJECT_SVC_RING_WEIGHTS}
+SWIFT_OBJECT_SVC_RING_ZONES=${SWIFT_OBJECT_SVC_RING_ZONES}
+SWIFT_CONTAINER_SVC_RING_NAME=${SWIFT_CONTAINER_SVC_RING_NAME}
+SWIFT_CONTAINER_SVC_RING_PART_POWER=${SWIFT_CONTAINER_SVC_RING_PART_POWER}
+SWIFT_CONTAINER_SVC_RING_REPLICAS=${SWIFT_CONTAINER_SVC_RING_REPLICAS}
+SWIFT_CONTAINER_SVC_RING_MIN_PART_HOURS=${SWIFT_CONTAINER_SVC_RING_MIN_PART_HOURS}
+SWIFT_CONTAINER_SVC_RING_HOSTS=${SWIFT_CONTAINER_SVC_RING_HOSTS}
+SWIFT_CONTAINER_SVC_RING_DEVICES=${SWIFT_CONTAINER_SVC_RING_DEVICES}
+SWIFT_CONTAINER_SVC_RING_WEIGHTS=${SWIFT_CONTAINER_SVC_RING_WEIGHTS}
+SWIFT_CONTAINER_SVC_RING_ZONES=${SWIFT_CONTAINER_SVC_RING_ZONES}
+SWIFT_ACCOUNT_SVC_RING_NAME=${SWIFT_ACCOUNT_SVC_RING_NAME}
+SWIFT_ACCOUNT_SVC_RING_PART_POWER=${SWIFT_ACCOUNT_SVC_RING_PART_POWER}
+SWIFT_ACCOUNT_SVC_RING_REPLICAS=${SWIFT_ACCOUNT_SVC_RING_REPLICAS}
+SWIFT_ACCOUNT_SVC_RING_MIN_PART_HOURS=${SWIFT_ACCOUNT_SVC_RING_MIN_PART_HOURS}
+SWIFT_ACCOUNT_SVC_RING_HOSTS=${SWIFT_ACCOUNT_SVC_RING_HOSTS}
+SWIFT_ACCOUNT_SVC_RING_DEVICES=${SWIFT_ACCOUNT_SVC_RING_DEVICES}
+SWIFT_ACCOUNT_SVC_RING_WEIGHTS=${SWIFT_ACCOUNT_SVC_RING_WEIGHTS}
+SWIFT_ACCOUNT_SVC_RING_ZONES=${SWIFT_ACCOUNT_SVC_RING_ZONES}
 TEMP_FILE=$TEMP_FILE
 TENANT_NETWORK_TYPES=$TENANT_NETWORK_TYPES
 TOKEN_DRIVER=$TOKEN_DRIVER