Merge "Fix Nova bootstrap"

This commit is contained in:
Jenkins 2016-08-08 20:46:15 +00:00 committed by Gerrit Code Review
commit cd1591b652
1 changed files with 44 additions and 35 deletions

View File

@ -5,8 +5,51 @@ spec:
metadata:
name: nova-compute-generate
spec:
hostNetwork: True
containers:
- image: "{{ kolla_toolbox_image_full }}"
name: creating-nova-database-and-users
command: ["sh", "-c"]
args:
- ansible localhost -vvvv -m mysql_db -a
"login_host={{ nova_database_address }}
login_port='{{ mariadb_port }}'
login_user='{{ database_user }}'
login_password='{{ database_password }}'
name='{{ nova_database_name }}'" &&
ansible localhost -vvvv -m mysql_db -a
"login_host={{ nova_api_database_address }}
login_port='{{ mariadb_port }}'
login_user='{{ database_user }}'
login_password='{{ database_password }}'
name='{{ nova_api_database_name }}'" &&
ansible localhost -m mysql_user -a
"login_host={{ nova_database_address }}
login_port='{{ mariadb_port }}'
login_user='{{ database_user }}'
login_password='{{ database_password }}'
name='{{ nova_database_name }}'
password='{{ nova_database_password }}'
host='%'
priv='{{ nova_database_name }}.*:ALL'
append_privs='yes'" &&
ansible localhost -m mysql_user -a
"login_host={{ nova_api_database_address }}
login_port='{{ mariadb_port }}'
login_user='{{ database_user }}'
login_password='{{ database_password }}'
name='{{ nova_api_database_name }}'
password='{{ nova_api_database_password }}'
host='%'
priv='{{ nova_api_database_name }}.*:ALL'
append_privs='yes'"
volumeMounts:
- mountPath: /var/log/kolla
name: kolla-logs
env:
- name: ANSIBLE_NOCOLOR
value: "1"
- name: ANSIBLE_LIBRARY
value: "/usr/share/ansible"
- image: "{{ nova_api_image_full }}"
name: nova-api
volumeMounts:
@ -23,44 +66,10 @@ spec:
value: ""
- name: KOLLA_CONFIG_STRATEGY
value: {{ config_strategy }}
- image: "{{ nova_conductor_image_full }}"
name: nova-conductor
volumeMounts:
- mountPath: {{ container_config_directory }}
name: nova-conductor-config
- mountPath: /etc/localtime
name: etc-localtime
- mountPath: /var/log/kolla
name: kolla-logs
env:
- name: KOLLA_BOOTSTRAP
value: ""
- name: KOLLA_CONFIG_STRATEGY
value: {{ config_strategy }}
- image: "{{ nova_scheduler_image_full }}"
name: nova-scheduler
volumeMounts:
- mountPath: {{ container_config_directory }}
name: nova-scheduler-config
- mountPath: /etc/localtime
name: etc-localtime
- mountPath: /var/log/kolla
name: kolla-logs
env:
- name: KOLLA_BOOTSTRAP
value: ""
- name: KOLLA_CONFIG_STRATEGY
value: {{ config_strategy }}
volumes:
- name: nova-api-config
configMap:
name: nova-api-configmap
- name: nova-conductor-config
configMap:
name: nova-conductor-configmap
- name: nova-scheduler-config
configMap:
name: nova-scheduler-configmap
- name: etc-localtime
hostPath:
path: /etc/localtime