From 72d1ef47ddc5e44868c56633707b346281e9d41a Mon Sep 17 00:00:00 2001
From: Ryan Hallisey <rhallise@redhat.com>
Date: Tue, 14 Apr 2015 16:29:21 -0400
Subject: Add cinder into the docker compose setup

This patch adds the docker-compose files, updates the docs,
and adds cinder to the start command.

Implements: blueprint container-set-storage-operation

Change-Id: I5386851e2247c00696704dc26a8a286451d4bf59
---
 tools/genenv | 69 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 tools/kolla  |  3 +++
 2 files changed, 72 insertions(+)

(limited to 'tools')

diff --git a/tools/genenv b/tools/genenv
index e182f66ed..b1a13fd37 100755
--- a/tools/genenv
+++ b/tools/genenv
@@ -26,6 +26,7 @@ ADMIN_USER_PASSWORD=steakfordinner
 HOST_IP=$MY_IP
 MARIADB_ROOT_PASSWORD=kolla
 PASSWORD=12345
+INIT_CINDER_DB=true
 
 # Galera
 DB_CLUSTER_BIND_ADDRESS=0.0.0.0
@@ -53,6 +54,11 @@ NEUTRON_SERVER_LOG_FILE=
 NEUTRON_L3_AGENT_LOG_FILE=
 NEUTRON_LINUXBRIDGE_AGENT_LOG_FILE=
 NEUTRON_METADATA_AGENT_LOG_FILE=
+CINDER_LOG_DIR=
+CINDER_API_LOG_FILE=
+CINDER_VOLUME_LOG_FILE=
+CINDER_BACKUP_LOG_FILE=
+CINDER_SCHEDULER_LOG_FILE=
 
 # RabbitMQ
 RABBITMQ_SERVICE_HOST=$HOST_IP
@@ -157,6 +163,35 @@ DESIGNATE_SINK_NEUTRON_DOMAIN_NAME=neutron.example.org.
 DESIGNATE_SINK_NOVA_FORMATS=("%(octet0)s-%(octet1)s-%(octet2)s-%(octet3)s.%(domain)s" "%(hostname)s.%(domain)s")
 DESIGNATE_SINK_NEUTRON_FORMATS=("%(octet0)s-%(octet1)s-%(octet2)s-%(octet3)s.%(domain)s" "%(hostname)s.%(domain)s")
 
+# Cinder API
+CINDER_API_SERVICE_HOST=$HOST_IP
+CINDER_API_SERVICE_PORT=8776
+CINDER_API_SERVICE_LISTEN=$HOST_IP
+CINDER_KEYSTONE_USER=cinder
+CINDER_KEYSTONE_PASSWORD=password
+CINDER_ADMIN_PASSWORD=password
+
+# Cinder Scheduler
+CINDER_DB_NAME=cinder
+CINDER_DB_USER=cinder
+CINDER_DB_PASSWORD=password
+
+# Cinder Backup
+CINDER_BACKUP_MANAGER=cinder.backup.manager.BackupManager
+CINDER_BACKUP_API_CLASS=cinder.backup.api.API
+CINDER_BACKUP_NAME_TEMPLATE=backup-%s
+CINDER_BACKUP_DRIVER=cinder.backup.drivers.swift
+
+# Cinder Volume
+ISCSI_HELPER=lioadm
+ISCSI_IP_ADDRESS=$HOST_IP
+CINDER_LVM_LO_VOLUME_SIZE=4G
+CINDER_VOLUME_API_LISTEN=$HOST_IP
+CINDER_VOLUME_GROUP=cinder-volumes
+CINDER_VOLUME_BACKEND_NAME=LVM_iSCSI57
+CINDER_VOLUME_DRIVER=cinder.volume.drivers.lvm.LVMISCSIDriver
+CINDER_ENABLED_BACKEND=lvm57
+
 cat > ./openrc <<EOF
 export OS_AUTH_URL="http://${KEYSTONE_PUBLIC_SERVICE_HOST}:5000/v2.0"
 export OS_USERNAME=$ADMIN_TENANT_NAME
@@ -273,7 +308,41 @@ DB_CLUSTER_INIT_DB=$DB_CLUSTER_INIT_DB
 DB_CLUSTER_NAME=$DB_CLUSTER_NAME
 DB_CLUSTER_NODES=$DB_CLUSTER_NODES
 DB_CLUSTER_WSREP_METHOD=$DB_CLUSTER_WSREP_METHOD
+CINDER_API_SERVICE_HOST=$HOST_IP
+CINDER_API_SERVICE_PORT=$CINDER_API_SERVICE_PORT
+CINDER_API_SERVICE_LISTEN=$MY_IP
+CINDER_KEYSTONE_USER=$CINDER_KEYSTONE_USER
+CINDER_KEYSTONE_PASSWORD=$CINDER_KEYSTONE_PASSWORD
+CINDER_ADMIN_PASSWORD=$CINDER_ADMIN_PASSWORD
+CINDER_DB_NAME=$CINDER_DB_NAME
+CINDER_DB_USER=$CINDER_DB_USER
+CINDER_DB_PASSWORD=$CINDER_DB_PASSWORD
+CINDER_BACKUP_MANAGER=$CINDER_BACKUP_MANAGER
+CINDER_BACKUP_API_CLASS=$CINDER_BACKUP_API_CLASS
+CINDER_BACKUP_NAME_TEMPLATE=$CINDER_BACKUP_NAME_TEMPLATE
+ISCSI_HELPER=$ISCSI_HELPER
+ISCSI_IP_ADDRESS=$ISCSI_IP_ADDRESS
+CINDER_BACKUP_DRIVER=$CINDER_BACKUP_DRIVER
+CINDER_LVM_LO_VOLUME_SIZE=$CINDER_LVM_LO_VOLUME_SIZE
+CINDER_VOLUME_GROUP=$CINDER_VOLUME_GROUP
+CINDER_VOLUME_API_LISTEN=$CINDER_VOLUME_API_LISTEN
+CINDER_VOLUME_BACKEND_NAME=$CINDER_VOLUME_BACKEND_NAME
+CINDER_VOLUME_DRIVER=$CINDER_VOLUME_DRIVER
+CINDER_ENABLED_BACKEND=$CINDER_ENABLED_BACKEND
+CINDER_LOG_DIR=$CINDER_LOG_DIR
+CINDER_API_LOG_FILE=$CINDER_API_LOG_FILE
+CINDER_VOLUME_LOG_FILE=$CINDER_VOLUME_LOG_FILE
+CINDER_BACKUP_LOG_FILE=$CINDER_BACKUP_LOG_FILE
+CINDER_SCHEDULER_LOG_FILE=$CINDER_SCHEDULER_LOG_FILE
 EOF
 echo Please customize your FLAT_INTERFACE to a different network then your
 echo main network. The FLAT_INTERFACE is used for inter-VM communication.
 echo the FLAT_INTERFACE should not have an IP address assigned.
+# https://bugs.launchpad.net/kolla/+bug/1461635
+echo
+echo Cinder requires mounting /dev in the cinder-volume, nova-compute,
+echo and libvirt containers.  If /dev/pts/ptmx does not have proper permissions
+echo on the host, then libvirt will fail to boot an instance.
+echo This is a bug in Docker where it is not correctly mounting /dev/pts
+echo **Temporary fix**
+echo chmod 666 /dev/pts/ptmx
diff --git a/tools/kolla b/tools/kolla
index f21f19807..d100a82c2 100755
--- a/tools/kolla
+++ b/tools/kolla
@@ -44,6 +44,9 @@ function process_all {
     process heat-api-engine
     process magnum-api-conductor
     process horizon
+    process cinder-api-scheduler
+    process cinder-backup
+    process cinder-volume
 }
 
 function check_selinux {
-- 
cgit v1.2.3