diff options
| author | Jeffrey Zhang <zhang.lei.fly@gmail.com> | 2016-09-29 11:38:10 +0800 |
|---|---|---|
| committer | Jeffrey Zhang <jeffrey.zhang@99cloud.net> | 2016-10-03 07:53:21 +0000 |
| commit | 903b0ff2112e59aa8a60e567b6c7f073b9a7a973 (patch) | |
| tree | f8cb8e99d4c72abe8de0de669fdd55d37c841b51 /ansible | |
| parent | 0226cca1a25c59ace8433650c81f83d0b78d9a33 (diff) | |
| download | kolla-903b0ff2112e59aa8a60e567b6c7f073b9a7a973.tar.gz kolla-903b0ff2112e59aa8a60e567b6c7f073b9a7a973.zip | |
Fix ironic failed
* Mount system folder in ironic-conductor
* Add package need in ironic-conductor
* Fix the log path issue
* Add ironic sudoer in ironic-base
* Fix credential issue
* Do not start nova-compute when enable ironic
Closes-Bug: #1629334
Change-Id: If9d478c6513de37465403d458a88cf0da7ebd8a6
Diffstat (limited to 'ansible')
| -rw-r--r-- | ansible/roles/ironic/tasks/start.yml | 10 | ||||
| -rw-r--r-- | ansible/roles/ironic/templates/ironic.conf.j2 | 10 | ||||
| -rw-r--r-- | ansible/roles/nova/tasks/start_compute.yml | 1 | ||||
| -rw-r--r-- | ansible/roles/nova/templates/nova.conf.j2 | 1 |
4 files changed, 17 insertions, 5 deletions
diff --git a/ansible/roles/ironic/tasks/start.yml b/ansible/roles/ironic/tasks/start.yml index 142faec66..7c1fbe899 100644 --- a/ansible/roles/ironic/tasks/start.yml +++ b/ansible/roles/ironic/tasks/start.yml @@ -17,8 +17,10 @@ common_options: "{{ docker_common_options }}" image: "{{ ironic_api_image_full }}" name: "ironic_api" - volumes: + volumes: - "{{ node_config_directory }}/ironic-api/:{{ container_config_directory }}/:ro" + - "/etc/localtime:/etc/localtime:ro" + - "kolla_logs:/var/log/kolla" when: inventory_hostname in groups['ironic-api'] - name: Starting ironic-conductor container @@ -27,9 +29,15 @@ common_options: "{{ docker_common_options }}" image: "{{ ironic_conductor_image_full }}" name: "ironic_conductor" + privileged: True volumes: - "{{ node_config_directory }}/ironic-conductor/:{{ container_config_directory }}/:ro" - "/etc/localtime:/etc/localtime:ro" + - "/sys:/sys" + - "/dev:/dev" + - "/run:/run" + - "kolla_logs:/var/log/kolla" + - "ironic:/var/lib/ironic" - "ironic_pxe:/tftpboot/" when: inventory_hostname in groups['ironic-conductor'] diff --git a/ansible/roles/ironic/templates/ironic.conf.j2 b/ansible/roles/ironic/templates/ironic.conf.j2 index 076a73f00..c1f84ae55 100644 --- a/ansible/roles/ironic/templates/ironic.conf.j2 +++ b/ansible/roles/ironic/templates/ironic.conf.j2 @@ -1,6 +1,8 @@ [DEFAULT] debug = {{ ironic_logging_debug }} +log_dir = /var/log/kolla/ironic + admin_user = {{ openstack_auth.username }} admin_password = {{ keystone_admin_password }} @@ -16,7 +18,7 @@ host_ip = {{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['a {% if service_name == 'ironic-conductor' %} [conductor] api_url = {{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ ironic_api_port }} -clean_nodes = false +automated_clean=false {% endif %} {% if service_name == 'ironic-inspector' %} @@ -41,9 +43,9 @@ auth_url = {{ admin_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_admin_po auth_type = password project_domain_id = default user_domain_id = default -admin_tenant_name = service -admin_user = {{ ironic_keystone_user }} -admin_password = {{ ironic_keystone_password }} +project_name = service +username = {{ ironic_keystone_user }} +password = {{ ironic_keystone_password }} memcache_security_strategy = ENCRYPT memcache_secret_key = {{ memcache_secret_key }} diff --git a/ansible/roles/nova/tasks/start_compute.yml b/ansible/roles/nova/tasks/start_compute.yml index ac8bf97df..df7674793 100644 --- a/ansible/roles/nova/tasks/start_compute.yml +++ b/ansible/roles/nova/tasks/start_compute.yml @@ -49,6 +49,7 @@ when: - inventory_hostname in groups['compute'] - not enable_nova_fake | bool + - not enable_ironic | bool - name: Starting nova-compute-ironic container kolla_docker: diff --git a/ansible/roles/nova/templates/nova.conf.j2 b/ansible/roles/nova/templates/nova.conf.j2 index 7a635c66f..82c991e94 100644 --- a/ansible/roles/nova/templates/nova.conf.j2 +++ b/ansible/roles/nova/templates/nova.conf.j2 @@ -96,6 +96,7 @@ html5proxy_port = {{ nova_spicehtml5proxy_port }} username = {{ ironic_keystone_user }} password = {{ ironic_keystone_password }} auth_url = {{ openstack_auth.auth_url }}/v3 +auth_type = password project_name = service user_domain_name = default project_domain_name = default |