diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-02-19 17:43:05 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-02-19 17:43:05 +0000 |
| commit | e613cb816a1f12d7f3228eec16efcffcf9cd5a78 (patch) | |
| tree | 8f680398d79b890ad0242ca1da67200433e6c6f8 /ansible | |
| parent | dd17fc26d601b331392d3a4e1b87ba379dac970c (diff) | |
| parent | 75e57824004ce8e5ee1317c3501c3b1bc481c790 (diff) | |
| download | kolla-e613cb816a1f12d7f3228eec16efcffcf9cd5a78.tar.gz kolla-e613cb816a1f12d7f3228eec16efcffcf9cd5a78.zip | |
Merge "Keep consistent with others for ironic containers"
Diffstat (limited to 'ansible')
| -rw-r--r-- | ansible/roles/ironic/tasks/bootstrap.yml | 2 | ||||
| -rw-r--r-- | ansible/roles/ironic/tasks/start.yml | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/ansible/roles/ironic/tasks/bootstrap.yml b/ansible/roles/ironic/tasks/bootstrap.yml index 3f7ceca5f..7c774544f 100644 --- a/ansible/roles/ironic/tasks/bootstrap.yml +++ b/ansible/roles/ironic/tasks/bootstrap.yml @@ -70,6 +70,6 @@ restart_policy: "never" volumes: - "{{ node_config_directory }}/ironic-pxe/:{{ container_config_directory }}/:ro" - - "ironic-pxe:/tftpboot/" + - "ironic_pxe:/tftpboot/" run_once: True delegate_to: "{{ groups['ironic-pxe'][0] }}" diff --git a/ansible/roles/ironic/tasks/start.yml b/ansible/roles/ironic/tasks/start.yml index 202d1b841..d728ec8f5 100644 --- a/ansible/roles/ironic/tasks/start.yml +++ b/ansible/roles/ironic/tasks/start.yml @@ -3,11 +3,11 @@ kolla_docker: action: "start_container" common_options: "{{ docker_common_options }}" - name: "ironic-pxe" + name: "ironic_pxe" image: "{{ ironic_pxe_image_full }}" volumes: - "{{ node_config_directory }}/ironic-pxe/:{{ container_config_directory }}/:ro" - - "ironic-pxe:/tftpboot/" + - "ironic_pxe:/tftpboot/" when: inventory_hostname in groups['ironic-pxe'] - name: Starting ironic-api container @@ -15,7 +15,7 @@ action: "start_container" common_options: "{{ docker_common_options }}" image: "{{ ironic_api_image_full }}" - name: "ironic-api" + name: "ironic_api" volumes: "{{ node_config_directory }}/ironic-api/:{{ container_config_directory }}/:ro" when: inventory_hostname in groups['ironic-api'] @@ -24,10 +24,10 @@ action: "start_container" common_options: "{{ docker_common_options }}" image: "{{ ironic_conductor_image_full }}" - name: "ironic-conductor" + name: "ironic_conductor" volumes: - "{{ node_config_directory }}/ironic-conductor/:{{ container_config_directory }}/:ro" - - "ironic-pxe:/tftpboot/" + - "ironic_pxe:/tftpboot/" when: inventory_hostname in groups['ironic-conductor'] - name: Starting ironic-discoverd container @@ -35,7 +35,7 @@ action: "start_container" common_options: "{{ docker_common_options }}" image: "{{ ironic_discoverd_image_full }}" - name: "ironic-discoverd" + name: "ironic_discoverd" privileged: True volumes: "{{ node_config_directory }}/ironic-discoverd/:{{ container_config_directory }}/:ro" when: inventory_hostname in groups['ironic-discoverd'] |