From 66f07ab5b583c92f444593c1fe2f0c1239b7131d Mon Sep 17 00:00:00 2001
From: Andrey Shestakov <ashestakov@mirantis.com>
Date: Thu, 26 Nov 2015 13:18:47 +0200
Subject: [PATCH] Share tftpboot directory for ironic-conductor and pxe
Node configs and images placed by ironic-conductor should be available
from tftp server.
/tftpboot directory should be shared between ironic-pxe and ironic-conductor
containers.
Closes-bug: #1520293
Change-Id: Iee6a73534ac38c4386a53b82fd3c567b8a971beb
---
ansible/roles/ironic/tasks/start.yml | 42 +++++++++++++++-------------
1 file changed, 23 insertions(+), 19 deletions(-)
diff --git a/ansible/roles/ironic/tasks/start.yml b/ansible/roles/ironic/tasks/start.yml
index a9ee921e05..2f7043e975 100644
--- a/ansible/roles/ironic/tasks/start.yml
+++ b/ansible/roles/ironic/tasks/start.yml
@@ -1,4 +1,25 @@
---
+- name: Starting Ironic-pxe container
+ docker:
+ tty: True
+ net: host
+ pull: "{{ docker_pull_policy }}"
+ restart_policy: "{{ docker_restart_policy }}"
+ restart_policy_retry: "{{ docker_restart_policy_retry }}"
+ state: reloaded
+ registry: "{{ docker_registry }}"
+ username: "{{ docker_registry_username }}"
+ password: "{{ docker_registry_password }}"
+ insecure_registry: "{{ docker_insecure_registry }}"
+ name: ironic-pxe
+ image: "{{ ironic_pxe_image_full }}"
+ volumes:
+ - "{{ node_config_directory }}/ironic-pxe/:{{ container_config_directory }}/:ro"
+ - "/tftpboot/"
+ env:
+ KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}"
+ when: inventory_hostname in groups['ironic-pxe']
+
- name: Starting Ironic-api container
docker:
tty: True
@@ -33,6 +54,8 @@
name: ironic-conductor
image: "{{ ironic_conductor_image_full }}"
volumes: "{{ node_config_directory }}/ironic-conductor/:{{ container_config_directory }}/:ro"
+ volumes_from:
+ - ironic-pxe
env:
KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}"
when: inventory_hostname in groups['ironic-conductor']
@@ -56,22 +79,3 @@
env:
KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}"
when: inventory_hostname in groups['ironic-discoverd']
-
-- name: Starting Ironic-pxe container
- docker:
- tty: True
- net: host
- pull: "{{ docker_pull_policy }}"
- restart_policy: "{{ docker_restart_policy }}"
- restart_policy_retry: "{{ docker_restart_policy_retry }}"
- state: reloaded
- registry: "{{ docker_registry }}"
- username: "{{ docker_registry_username }}"
- password: "{{ docker_registry_password }}"
- insecure_registry: "{{ docker_insecure_registry }}"
- name: ironic-pxe
- image: "{{ ironic_pxe_image_full }}"
- volumes: "{{ node_config_directory }}/ironic-pxe/:{{ container_config_directory }}/:ro"
- env:
- KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}"
- when: inventory_hostname in groups['ironic-pxe']