openstack
/
kolla-kubernetes
Code Issues Proposed changes

Merge "Implement Keystone Bootstrap Job"

This commit is contained in:
Jenkins 2016-05-26 11:34:49 +00:00 committed by Gerrit Code Review
parent 52b219d981 4542558893
commit 19aa080359
2 changed files with 107 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

96
bootstrap/keystone/keystone-job.yml.j2 Normal file
View File

@ -0,0 +1,96 @@
apiVersion: batch/v1
kind: Job
metadata:
name: keystone-bootstrap
spec:
template:
metadata:
name: keystone-bootstrap
spec:
restartPolicy: OnFailure
hostNetwork: True
containers:
- image: "{{ kolla_toolbox_image_full }}"
name: creating-keystone-database
#TODO: Assign the IP to be mariadb's serivce ip exposed by Kubernetes
command: ["usr/bin/ansible", "localhost", "-m", "mysql_db",
"-a", "login_host='10.18.57.43'
login_port='{{ mariadb_port }}'
login_user='{{ database_user }}'
login_password='{{ database_password }}'
name='{{ keystone_database_name }}'"]
volumeMounts:
- mountPath: /dev
name: dev
- mountPath: /run
name: run
- mountPath: /var/log/kolla
name: kolla-logs
env:
- name: ANSIBLE_NOCOLOR
value: "1"
- name: ANSIBLE_LIBRARY
value: "/usr/share/ansible"
- image: "{{ kolla_toolbox_image_full }}"
name: creating-keystone-user-and-permissions
#TODO: Assign the IP to be mariadb's serivce ip exposed by Kubernetes
command: ["/usr/bin/ansible", "localhost", "-m", "mysql_user",
"-a", "login_host='10.18.57.43'
login_port='{{ mariadb_port }}'
login_user='{{ database_user }}'
login_password='{{ database_password }}'
name='{{ keystone_database_name }}'
password='{{ keystone_database_password }}'
host='%'
priv='{{ keystone_database_name }}.*:ALL'
append_privs='yes'"]
volumeMounts:
- mountPath: /dev
name: dev
- mountPath: /run
name: run
- mountPath: /var/log/kolla
name: kolla-logs
env:
- name: ANSIBLE_NOCOLOR
value: "1"
- name: ANSIBLE_LIBRARY
value: "/usr/share/ansible"
- image: "{{ keystone_image_full }}"
name: keystone-config
volumeMounts:
- mountPath: {{ container_config_directory }}
name: keystone-config
readOnly: true
- mountPath: /var/log/kolla
name: kolla-logs
env:
- name: KOLLA_KUBERNETES_BOOTSTRAP
value: ""
- name: KOLLA_CONFIG_STRATEGY
value: "{{ config_strategy }}"
#TODO: Replace with templated values
- name: ETCD_HOST
value: "127.0.0.1"
- name: ETCD_PORT
value: "4001"
volumes:
- name: keystone-config
configMap:
name: keystone-configmap
- name: keystone-persistent-storage
hostPath:
path: /var/lib/keystone
- name: dev
hostPath:
path: /dev
- name: run
hostPath:
path: /run
- name: etc-localtime
hostPath:
path: /etc/localtime
- name: kolla-logs
emptyDir: {}

13
services/keystone/keystone-pod.yml.j2
View File

@ -1,5 +1,7 @@
apiVersion: v1
kind: Pod
metadata:
name: keystone
spec:
hostNetwork: True
containers:
@ -8,12 +10,19 @@ spec:
volumeMounts:
- mountPath: {{ container_config_directory }}
name: keystone-config
- mountPath: /var/log/kolla
name: kolla-logs
env:
- name: KOLLA_CONFIG_STRATEGY
value: {{ config_strategy }}
#TODO: Replace with templated values
- name: ETCD_HOST
value: "127.0.0.1"
- name: ETCD_PORT
value: "4001"
volumes:
- name: keystone-config
configMap:
name: keystone-configmap
metadata:
name: keystone
- name: kolla-logs
emptyDir: {}