From 9d26ecec334d4d46da81754a132fbc40977daf16 Mon Sep 17 00:00:00 2001 From: Alan Meadows Date: Mon, 28 Nov 2016 09:28:42 -0800 Subject: [PATCH] incorporate cleanup feedback from PR#11 --- ceph/values.yaml | 4 ++-- keystone/requirements.yaml | 2 +- keystone/templates/db-sync.yaml | 28 +++++++------------------- keystone/templates/deployment.yaml | 31 ++++++++--------------------- keystone/templates/init.yaml | 23 +++++---------------- mariadb/requirements.yaml | 2 +- memcached/requirements.yaml | 2 +- memcached/templates/deployment.yaml | 14 +------------ rabbitmq/requirements.yaml | 2 +- rabbitmq/templates/service.yaml | 2 +- rabbitmq/values.yaml | 1 - 11 files changed, 28 insertions(+), 83 deletions(-) diff --git a/ceph/values.yaml b/ceph/values.yaml index baaaa9d110..c90d197c8d 100644 --- a/ceph/values.yaml +++ b/ceph/values.yaml @@ -14,9 +14,9 @@ images: labels: node_selector_key: ceph-storage node_selector_value: enabled - + network: port: mon: 6789 rgw_ingress: 80 - rgw_target: 8088 \ No newline at end of file + rgw_target: 8088 diff --git a/keystone/requirements.yaml b/keystone/requirements.yaml index e7bf2cc758..e6cd7e38a0 100644 --- a/keystone/requirements.yaml +++ b/keystone/requirements.yaml @@ -13,4 +13,4 @@ dependencies: dependencies: - name: memcached repository: http://localhost:8879/charts - version: 0.1.0 \ No newline at end of file + version: 0.1.0 diff --git a/keystone/templates/db-sync.yaml b/keystone/templates/db-sync.yaml index e4ed368842..7ba6006ea6 100644 --- a/keystone/templates/db-sync.yaml +++ b/keystone/templates/db-sync.yaml @@ -11,13 +11,17 @@ spec: "name": "init", "image": "quay.io/stackanetes/kubernetes-entrypoint:v0.1.0", "env": [ + { + "name": "NAMESPACE", + "value": "{{ .Release.Namespace }}" + }, { "name": "DEPENDENCY_SERVICE", "value": "mariadb" }, { "name": "DEPENDENCY_JOBS", - "value": "mariadb-seed,keystone-init" + "value": "mariadb-seed,keystone-db-sync" }, { "name": "COMMAND", @@ -26,7 +30,6 @@ spec: ] } ]' - spec: restartPolicy: OnFailure containers: @@ -34,25 +37,8 @@ spec: image: {{ .Values.images.db_sync }} imagePullPolicy: Always command: - - bash - - /tmp/db-sync.sh - env: - - name: INTERFACE_NAME - value: "eth0" - - name: POD_NAME - valueFrom: - fieldRef: - fieldPath: metadata.name - - name: NAMESPACE - valueFrom: - fieldRef: - fieldPath: metadata.namespace - - name: COMMAND - value: "bash /tmp/db-sync.sh" - - name: DEPENDENCY_JOBS - value: "keystone-init,mariadb-seed" - - name: DEPENDENCY_SERVICE - value: "mariadb" + - bash + - /tmp/db-sync.sh volumeMounts: - name: keystoneconf mountPath: /etc/keystone/keystone.conf diff --git a/keystone/templates/deployment.yaml b/keystone/templates/deployment.yaml index 75f255d1c8..8c124df54d 100644 --- a/keystone/templates/deployment.yaml +++ b/keystone/templates/deployment.yaml @@ -20,16 +20,20 @@ spec: }, { "name": "DEPENDENCY_SERVICE", - "value": "mariadb" + "value": "mariadb,rabbitmq" }, { "name": "DEPENDENCY_JOBS", "value": "mariadb-seed" }, + { + "name": "DEPENDENCY_CONFIG", + "value": "/etc/apache2/conf-enabled/wsgi-keystone.conf" + }, { "name": "COMMAND", "value": "echo done" - } + } ] } ]' @@ -40,27 +44,8 @@ spec: - name: keystone-api image: {{ .Values.images.api }} command: - - bash - - /tmp/start.sh - env: - - name: INTERFACE_NAME - value: "eth0" - - name: POD_NAME - valueFrom: - fieldRef: - fieldPath: metadata.name - - name: NAMESPACE - valueFrom: - fieldRef: - fieldPath: metadata.namespace - - name: COMMAND - value: "bash /tmp/start.sh" - - name: DEPENDENCY_JOBS - value: "keystone-init,keystone-db-sync,mariadb-seed" - - name: DEPENDENCY_SERVICE - value: "mariadb,rabbitmq" - - name: DEPENDENCY_CONFIG - value: "/etc/apache2/conf-enabled/wsgi-keystone.conf" + - bash + - /tmp/start.sh ports: - containerPort: {{ .Values.network.port.public }} - containerPort: {{ .Values.network.port.admin }} diff --git a/keystone/templates/init.yaml b/keystone/templates/init.yaml index 736cf3cdd2..5fc9b4776f 100644 --- a/keystone/templates/init.yaml +++ b/keystone/templates/init.yaml @@ -11,13 +11,17 @@ spec: "name": "init", "image": "quay.io/stackanetes/kubernetes-entrypoint:v0.1.0", "env": [ + { + "name": "NAMESPACE", + "value": "{{ .Release.Namespace }}" + }, { "name": "DEPENDENCY_SERVICE", "value": "mariadb" }, { "name": "DEPENDENCY_JOBS", - "value": "mariadb-seed,keystone-init" + "value": "mariadb-seed" }, { "name": "COMMAND", @@ -32,23 +36,6 @@ spec: - name: keystone-init image: {{ .Values.images.init }} imagePullPolicy: Always - env: - - name: INTERFACE_NAME - value: "eth0" - - name: POD_NAME - valueFrom: - fieldRef: - fieldPath: metadata.name - - name: NAMESPACE - valueFrom: - fieldRef: - fieldPath: metadata.namespace - - name: COMMAND - value: "bash /tmp/init.sh" - - name: DEPENDENCY_JOBS - value: "mariadb-seed" - - name: DEPENDENCY_SERVICE - value: "mariadb" volumeMounts: - name: initsh mountPath: /tmp/init.sh diff --git a/mariadb/requirements.yaml b/mariadb/requirements.yaml index 5c7da3a50e..a16c269ac6 100644 --- a/mariadb/requirements.yaml +++ b/mariadb/requirements.yaml @@ -1,4 +1,4 @@ dependencies: - name: openstack-base repository: http://localhost:8879/charts - version: 0.1.0 \ No newline at end of file + version: 0.1.0 diff --git a/memcached/requirements.yaml b/memcached/requirements.yaml index 5c7da3a50e..a16c269ac6 100644 --- a/memcached/requirements.yaml +++ b/memcached/requirements.yaml @@ -1,4 +1,4 @@ dependencies: - name: openstack-base repository: http://localhost:8879/charts - version: 0.1.0 \ No newline at end of file + version: 0.1.0 diff --git a/memcached/templates/deployment.yaml b/memcached/templates/deployment.yaml index 318425485f..2715ef7555 100644 --- a/memcached/templates/deployment.yaml +++ b/memcached/templates/deployment.yaml @@ -15,19 +15,7 @@ spec: - name: memcached image: {{ .Values.images.memcached }} imagePullPolicy: Always - env: - - name: INTERFACE_NAME - value: "eth0" - - name: POD_NAME - valueFrom: - fieldRef: - fieldPath: metadata.name - - name: NAMESPACE - valueFrom: - fieldRef: - fieldPath: metadata.namespace - - name: COMMAND - value: "memcached -v -p {{ .Values.network.port }} -U 0 -c 8192 -m 1024" + command: "memcached -v -p {{ .Values.network.port }} -U 0 -c 8192 -m 1024" ports: - containerPort: {{ .Values.network.port }} readinessProbe: diff --git a/rabbitmq/requirements.yaml b/rabbitmq/requirements.yaml index 5c7da3a50e..a16c269ac6 100644 --- a/rabbitmq/requirements.yaml +++ b/rabbitmq/requirements.yaml @@ -1,4 +1,4 @@ dependencies: - name: openstack-base repository: http://localhost:8879/charts - version: 0.1.0 \ No newline at end of file + version: 0.1.0 diff --git a/rabbitmq/templates/service.yaml b/rabbitmq/templates/service.yaml index c793ac2d77..5fd7c6bc78 100644 --- a/rabbitmq/templates/service.yaml +++ b/rabbitmq/templates/service.yaml @@ -6,4 +6,4 @@ spec: ports: - port: {{.Values.network.port.public}} selector: - app: rabbitmq \ No newline at end of file + app: rabbitmq diff --git a/rabbitmq/values.yaml b/rabbitmq/values.yaml index f119c3a95b..72c3acf841 100644 --- a/rabbitmq/values.yaml +++ b/rabbitmq/values.yaml @@ -23,4 +23,3 @@ network: images: rabbitmq: "rabbitmq:3-management" -