From 263025bd3dbbf168da54778976c60d5b1eee49ad Mon Sep 17 00:00:00 2001 From: Pete Birley Date: Mon, 12 Dec 2016 04:50:53 +0000 Subject: [PATCH 1/2] Update readme to fix secret generation ordering The quickstart guide was attempting to build the helm charts for Ceph before the secrets currently embedded within it were prepared. This commit fixes that and also provides instructions for installing Sigil. --- README.md | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 4a8f5f1a03..c03279b69f 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,7 @@ Note that in addition to Kubernetes 1.5.0-beta.1, you will need to replace the k The kubelet should pick up the change and restart the container. -Finally, for the kube-controller-manager to be able to talk to the ceph-mon instances, ensure it can resolve ceph-mon.ceph (assuming you install the ceph chart into the ceph namespace). This is done by ensuring that both the baremetal host running the kubelet process and the kube-controller-manager container have the SkyDNS address and the appropriate search string in /etc/resolv.conf. This is covered in more detail in the [ceph](ceph/README.md) but a typical resolv.conf would look like this: +For the kube-controller-manager to be able to talk to the ceph-mon instances, ensure it can resolve ceph-mon.ceph (assuming you install the ceph chart into the ceph namespace). This is done by ensuring that both the baremetal host running the kubelet process and the kube-controller-manager container have the SkyDNS address and the appropriate search string in /etc/resolv.conf. This is covered in more detail in the [ceph](ceph/README.md) but a typical resolv.conf would look like this: ``` nameserver 10.32.0.2 ### skydns instance ip @@ -38,6 +38,13 @@ nameserver 8.8.8.8 nameserver 8.8.4.4 search svc.cluster.local ``` + +Finally, you need to install Sigil to help in the generation of Ceph Secrets. You can do this by running the following command as root: + +``` +curl -L https://github.com/gliderlabs/sigil/releases/download/v0.4.0/sigil_0.4.0_Linux_x86_64.tgz | tar -zxC /usr/local/bin +``` + ## QuickStart You can start aic-helm fairly quickly. Assuming the above requirements are met, you can install the charts in a layered approach. Today, the openstack chart is only tied to the mariadb sub-chart. We will continue to add other OpenStack components into the openstack parent chart as they are validated. @@ -49,10 +56,8 @@ Note that the openstack parent chart should always be used as it does some prepa kubectl label nodes node-type=storage --all kubectl label nodes openstack-control-plane=enabled --all -# build aic-helm +# move into the aic-helm directory cd aic-helm -helm serve . & -make # generate secrets (ceph, etc.) export osd_cluster_network=10.32.0.0/12 @@ -61,6 +66,10 @@ cd common/utils/secret-generator ./generate_secrets.sh all `./generate_secrets.sh fsid` cd ../../.. +# now you are ready to build aic-helm +helm serve . & +make + # install helm install local/chef --namespace=ceph helm install local/openstack --namespace=openstack From 3581d443a42fb716a34a5bac270d546e51cb8959 Mon Sep 17 00:00:00 2001 From: DTadrzak Date: Wed, 14 Dec 2016 15:12:13 +0100 Subject: [PATCH 2/2] Keystone trivial fix Fixed: mount path for mp-event.conf and wsgi-keystone.conf Deleted: unnecessary start.sh file Signed-off-by: DTadrzak --- keystone/templates/bin-configmap.yaml | 2 -- keystone/templates/bin/_start.sh.tpl | 12 ------------ keystone/templates/deployment.yaml | 12 +++--------- 3 files changed, 3 insertions(+), 23 deletions(-) delete mode 100644 keystone/templates/bin/_start.sh.tpl diff --git a/keystone/templates/bin-configmap.yaml b/keystone/templates/bin-configmap.yaml index 76e0f7cf14..ea514e46fa 100644 --- a/keystone/templates/bin-configmap.yaml +++ b/keystone/templates/bin-configmap.yaml @@ -7,5 +7,3 @@ data: {{ tuple "bin/_db-sync.sh.tpl" . | include "template" | indent 4 }} init.sh: | {{ tuple "bin/_init.sh.tpl" . | include "template" | indent 4 }} - start.sh: | -{{ tuple "bin/_start.sh.tpl" . | include "template" | indent 4 }} diff --git a/keystone/templates/bin/_start.sh.tpl b/keystone/templates/bin/_start.sh.tpl deleted file mode 100644 index 7c802358bc..0000000000 --- a/keystone/templates/bin/_start.sh.tpl +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/bash -set -ex - -# link our keystone wsgi to apaches running config -ln -s /configmaps/wsgi-keystone.conf /etc/apache2/sites-enabled/wsgi-keystone.conf - -# Loading Apache2 ENV variables -source /etc/apache2/envvars -rm -rf /var/run/apache2/* -APACHE_DIR="apache2" - -apache2 -DFOREGROUND diff --git a/keystone/templates/deployment.yaml b/keystone/templates/deployment.yaml index 3bb6027ee4..d4ebbaa3e6 100644 --- a/keystone/templates/deployment.yaml +++ b/keystone/templates/deployment.yaml @@ -44,8 +44,8 @@ spec: - name: keystone-api image: {{ .Values.images.api }} command: - - bash - - /tmp/start.sh + - apache2 + - -DFOREGROUND ports: - containerPort: {{ .Values.network.port.public }} - containerPort: {{ .Values.network.port.admin }} @@ -57,14 +57,11 @@ spec: mountPath: /etc/keystone/keystone.conf subPath: keystone.conf - name: wsgikeystone - mountPath: /configmaps/wsgi-keystone.conf + mountPath: /etc/apache2/conf-enabled/wsgi-keystone.conf subPath: wsgi_keystone.conf - name: mpmeventconf mountPath: /etc/apache2/mods-available/mpm_event.conf subPath: mpm_event.conf - - name: startsh - mountPath: /tmp/start.sh - subPath: start.sh volumes: - name: keystoneconf configMap: @@ -84,6 +81,3 @@ spec: items: - key: mpm-event.conf path: mpm_event.conf - - name: startsh - configMap: - name: keystone-bin