summaryrefslogtreecommitdiff
path: root/docker
diff options
context:
space:
mode:
authorSteven Dake <stdake@cisco.com>2015-05-02 20:36:27 -0700
committerSteven Dake <stdake@cisco.com>2015-05-11 09:26:02 -0700
commit5a06901664cd8d3bb326d9e731e7dd82eec54f35 (patch)
treecb7093a8f2f19db134c9ac4350f62f9b8351383c /docker
parent56e72a6bcf1f06081d5513c79080436001c2afcc (diff)
downloadkolla-5a06901664cd8d3bb326d9e731e7dd82eec54f35.tar.gz
kolla-5a06901664cd8d3bb326d9e731e7dd82eec54f35.zip
Add Magnum Containers as a Service to Kolla
This adds Magnum Containers as a Service to Kolla. Change-Id: I572cd62845515f42a6a16291d2bd87ad8d972e24 Implements-blueprint: container-magnum
Diffstat (limited to 'docker')
-rw-r--r--docker/magnum/magnum-api/Dockerfile11
l---------docker/magnum/magnum-api/build1
-rwxr-xr-xdocker/magnum/magnum-api/check.sh16
-rwxr-xr-xdocker/magnum/magnum-api/start.sh27
-rw-r--r--docker/magnum/magnum-base/Dockerfile9
l---------docker/magnum/magnum-base/build1
-rwxr-xr-xdocker/magnum/magnum-base/config-magnum.sh46
-rw-r--r--docker/magnum/magnum-conductor/Dockerfile13
l---------docker/magnum/magnum-conductor/build1
-rwxr-xr-xdocker/magnum/magnum-conductor/start.sh17
10 files changed, 142 insertions, 0 deletions
diff --git a/docker/magnum/magnum-api/Dockerfile b/docker/magnum/magnum-api/Dockerfile
new file mode 100644
index 000000000..84efa2a92
--- /dev/null
+++ b/docker/magnum/magnum-api/Dockerfile
@@ -0,0 +1,11 @@
+FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%magnum-base:%%KOLLA_TAG%%
+MAINTAINER Kolla Project (https://launchpad.net/kolla)
+
+RUN yum -y install \
+ openstack-magnum-api \
+ && yum clean all
+
+ADD ./start.sh /start.sh
+ADD ./check.sh /check.sh
+
+CMD ["/start.sh"]
diff --git a/docker/magnum/magnum-api/build b/docker/magnum/magnum-api/build
new file mode 120000
index 000000000..43944faa0
--- /dev/null
+++ b/docker/magnum/magnum-api/build
@@ -0,0 +1 @@
+../../../tools/build-docker-image \ No newline at end of file
diff --git a/docker/magnum/magnum-api/check.sh b/docker/magnum/magnum-api/check.sh
new file mode 100755
index 000000000..ee03dc6d2
--- /dev/null
+++ b/docker/magnum/magnum-api/check.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+RES=0
+
+. /openrc
+if ! keystone token-get > /dev/null; then
+ echo "ERROR: keystone token-get failed" >&2
+ RES=1
+else
+ if ! heat stack-list > /dev/null; then
+ echo "ERROR: heat stack-list failed" >&2
+ RES=1
+ fi
+fi
+
+exit $RES
diff --git a/docker/magnum/magnum-api/start.sh b/docker/magnum/magnum-api/start.sh
new file mode 100755
index 000000000..00a51b3cd
--- /dev/null
+++ b/docker/magnum/magnum-api/start.sh
@@ -0,0 +1,27 @@
+#!/bin/bash
+set -e
+
+. /opt/kolla/kolla-common.sh
+. /opt/kolla/config-magnum.sh
+
+check_required_vars KEYSTONE_ADMIN_TOKEN KEYSTONE_ADMIN_SERVICE_HOST \
+ MAGNUM_KEYSTONE_USER MAGNUM_KEYSTONE_PASSWORD \
+ KEYSTONE_AUTH_PROTOCOL ADMIN_TENANT_NAME \
+ MAGNUM_API_SERVICE_HOST KEYSTONE_ADMIN_SERVICE_PORT \
+ MAGNUM_API_SERVICE_PORT
+
+fail_unless_os_service_running keystone
+
+export SERVICE_TOKEN="${KEYSTONE_ADMIN_TOKEN}"
+export SERVICE_ENDPOINT="${KEYSTONE_AUTH_PROTOCOL}://${KEYSTONE_ADMIN_SERVICE_HOST}:${KEYSTONE_ADMIN_SERVICE_PORT}/v2.0"
+crux user-create -n ${MAGNUM_KEYSTONE_USER} \
+ -p ${MAGNUM_KEYSTONE_PASSWORD} \
+ -t ${ADMIN_TENANT_NAME} \
+ -r admin
+
+crux endpoint-create --remove-all -n ${MAGNUM_KEYSTONE_USER} -t container \
+ -I "${KEYSTONE_AUTH_PROTOCOL}://${MAGNUM_API_SERVICE_HOST}:${MAGNUM_API_SERVICE_PORT}/v1" \
+ -P "${KEYSTONE_AUTH_PROTOCOL}://${MAGNUM_API_SERVICE_HOST}:${MAGNUM_API_SERVICE_PORT}/v1" \
+ -A "${KEYSTONE_AUTH_PROTOCOL}://${MAGNUM_API_SERVICE_HOST}:${MAGNUM_API_SERVICE_PORT}/v1"
+
+exec /usr/bin/magnum-api
diff --git a/docker/magnum/magnum-base/Dockerfile b/docker/magnum/magnum-base/Dockerfile
new file mode 100644
index 000000000..c9c3db08b
--- /dev/null
+++ b/docker/magnum/magnum-base/Dockerfile
@@ -0,0 +1,9 @@
+FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%%
+MAINTAINER Kolla Project (https://launchpad.net/kolla)
+
+# Magnum is not yet in upstream RDO packaging
+
+RUN curl https://copr.fedoraproject.org/coprs/sdake/openstack-magnum/repo/epel-7/sdake-openstack-magnum-epel-7.repo -o /etc/yum.repos.d/sdake-openstack-magnum-epel-7.repo
+
+RUN mkdir -p /opt/kolla
+COPY config-magnum.sh /opt/kolla/config-magnum.sh
diff --git a/docker/magnum/magnum-base/build b/docker/magnum/magnum-base/build
new file mode 120000
index 000000000..43944faa0
--- /dev/null
+++ b/docker/magnum/magnum-base/build
@@ -0,0 +1 @@
+../../../tools/build-docker-image \ No newline at end of file
diff --git a/docker/magnum/magnum-base/config-magnum.sh b/docker/magnum/magnum-base/config-magnum.sh
new file mode 100755
index 000000000..03599d359
--- /dev/null
+++ b/docker/magnum/magnum-base/config-magnum.sh
@@ -0,0 +1,46 @@
+#!/bin/bash
+
+set -e
+
+. /opt/kolla/kolla-common.sh
+
+check_required_vars MAGNUM_DB_PASSWORD MAGNUM_KEYSTONE_PASSWORD \
+ KEYSTONE_PUBLIC_SERVICE_HOST KEYSTONE_PUBLIC_SERVICE_PORT \
+ MAGNUM_KEYSTONE_USER ADMIN_TENANT_NAME \
+ MAGNUM_DB_USER MAGNUM_DB_NAME KEYSTONE_AUTH_PROTOCOL \
+ KEYSTONE_PUBLIC_SERVICE_PORT RABBITMQ_SERVICE_HOST \
+ VERBOSE_LOGGING DEBUG_LOGGING
+
+fail_unless_db
+dump_vars
+
+cat > /openrc <<EOF
+export OS_AUTH_URL="http://${KEYSTONE_PUBLIC_SERVICE_HOST}:${KEYSTONE_PUBLIC_SERVICE_PORT}/v2.0"
+export OS_USERNAME="${MAGNUM_KEYSTONE_USER}"
+export OS_PASSWORD="${MAGNUM_KEYSTONE_PASSWORD}"
+export OS_TENANT_NAME="${ADMIN_TENANT_NAME}"
+EOF
+
+cfg=/etc/magnum/magnum.conf
+
+crudini --set $cfg DEFAULT log_file ""
+crudini --set $cfg DEFAULT verbose "${VERBOSE_LOGGING}"
+crudini --set $cfg DEFAULT debug "${DEBUG_LOGGING}"
+crudini --set $cfg DEFAULT use_stderr true
+crudini --set $cfg DEFAULT rpc_backend magnum.openstack.common.rpc.impl_kombu
+crudini --set $cfg DEFAULT admin_user admin
+crudini --set $cfg oslo_messaging_rabbit rabbit_host ${RABBITMQ_SERVICE_HOST}
+crudini --set $cfg oslo_messaging_rabbit rabbit_userid ${RABBIT_USER}
+crudini --set $cfg oslo_messaging_rabbit rabbit_password ${RABBIT_PASSWORD}
+crudini --set $cfg database connection \
+ mysql://${MAGNUM_DB_USER}:${MAGNUM_DB_PASSWORD}@${MARIADB_SERVICE_HOST}/${MAGNUM_DB_NAME}
+crudini --set $cfg keystone_authtoken auth_protocol "${KEYSTONE_AUTH_PROTOCOL}"
+crudini --set $cfg keystone_authtoken auth_host "${KEYSTONE_PUBLIC_SERVICE_HOST}"
+crudini --set $cfg keystone_authtoken auth_port "${KEYSTONE_PUBLIC_SERVICE_PORT}"
+crudini --set $cfg keystone_authtoken auth_uri \
+ "${KEYSTONE_AUTH_PROTOCOL}://${KEYSTONE_PUBLIC_SERVICE_HOST}:${KEYSTONE_PUBLIC_SERVICE_PORT}/v2.0"
+crudini --set $cfg keystone_authtoken admin_tenant_name "${ADMIN_TENANT_NAME}"
+crudini --set $cfg keystone_authtoken admin_user "${MAGNUM_KEYSTONE_USER}"
+crudini --set $cfg keystone_authtoken admin_password \
+ "${MAGNUM_KEYSTONE_PASSWORD}"
+crudini --set $cfg api host ${MAGNUM_API_SERVICE_HOST}
diff --git a/docker/magnum/magnum-conductor/Dockerfile b/docker/magnum/magnum-conductor/Dockerfile
new file mode 100644
index 000000000..f3d506cb8
--- /dev/null
+++ b/docker/magnum/magnum-conductor/Dockerfile
@@ -0,0 +1,13 @@
+FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%magnum-base:%%KOLLA_TAG%%
+MAINTAINER Kolla Project (https://launchpad.net/kolla)
+
+RUN yum -y install \
+ openstack-magnum-conductor \
+ tar \
+ && yum clean all
+
+# Install kubectl binary (ugh)
+RUN cd /tmp && curl -L https://github.com/GoogleCloudPlatform/kubernetes/releases/download/v0.15.0/kubernetes.tar.gz -o /tmp/kubernetes.tar.gz && /usr/bin/tar -xzvf /tmp/kubernetes.tar.gz && cp -a /tmp/kubernetes/platforms/linux/amd64/kubectl /usr/bin/kubectl && rm -rf /tmp/kubernetes
+
+ADD ./start.sh /start.sh
+CMD ["/start.sh"]
diff --git a/docker/magnum/magnum-conductor/build b/docker/magnum/magnum-conductor/build
new file mode 120000
index 000000000..43944faa0
--- /dev/null
+++ b/docker/magnum/magnum-conductor/build
@@ -0,0 +1 @@
+../../../tools/build-docker-image \ No newline at end of file
diff --git a/docker/magnum/magnum-conductor/start.sh b/docker/magnum/magnum-conductor/start.sh
new file mode 100755
index 000000000..4cf1291a3
--- /dev/null
+++ b/docker/magnum/magnum-conductor/start.sh
@@ -0,0 +1,17 @@
+#!/bin/bash
+
+. /opt/kolla/kolla-common.sh
+. /opt/kolla/config-magnum.sh
+
+check_required_vars MAGNUM_DB_NAME MAGNUM_DB_USER MAGNUM_DB_PASSWORD
+fail_unless_db
+
+mysql -h ${MARIADB_SERVICE_HOST} -u root -p${DB_ROOT_PASSWORD} mysql <<EOF
+CREATE DATABASE IF NOT EXISTS ${MAGNUM_DB_NAME} DEFAULT CHARACTER SET utf8;
+GRANT ALL PRIVILEGES ON ${MAGNUM_DB_NAME}.* TO
+ '${MAGNUM_DB_USER}'@'%' IDENTIFIED BY '${MAGNUM_DB_PASSWORD}'
+EOF
+
+/usr/bin/magnum-db-manage upgrade
+
+exec /usr/bin/magnum-conductor