diff options
| author | Allen Gao <wanlong.gao@easystack.cn> | 2016-02-16 17:00:59 +0800 |
|---|---|---|
| committer | Allen Gao <wanlong.gao@easystack.cn> | 2016-02-19 20:30:59 +0800 |
| commit | 75e57824004ce8e5ee1317c3501c3b1bc481c790 (patch) | |
| tree | 5849628817cedeff23f57b67602ee7c0881c7800 | |
| parent | 2ccb83cee19425ca081a0c106b097ec3da861ed0 (diff) | |
| download | kolla-75e57824004ce8e5ee1317c3501c3b1bc481c790.tar.gz kolla-75e57824004ce8e5ee1317c3501c3b1bc481c790.zip | |
Keep consistent with others for ironic containers
Make the containers and volumes names of ironic to be
consistent with others.
Partially-implements: blueprint ironic-container
Change-Id: If78b020c81157a948c5c3283f1410bcb6e5c1e61
| -rw-r--r-- | ansible/roles/ironic/tasks/bootstrap.yml | 2 | ||||
| -rw-r--r-- | ansible/roles/ironic/tasks/start.yml | 12 | ||||
| -rwxr-xr-x | tools/cleanup-containers | 4 |
3 files changed, 9 insertions, 9 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'] diff --git a/tools/cleanup-containers b/tools/cleanup-containers index cb3b2a733..1ac6d6e31 100755 --- a/tools/cleanup-containers +++ b/tools/cleanup-containers @@ -17,7 +17,7 @@ else haproxy \ heat_{api{,_cfn},engine} \ horizon \ - ironic-{discoverd,conductor,api,pxe} \ + ironic_{discoverd,conductor,api,pxe} \ keepalived \ keystone \ kolla_toolbox \ @@ -39,7 +39,7 @@ else volumes_to_remove=( glance \ - ironic-pxe \ + ironic_pxe \ mariadb \ openvswitch_db \ neutron_metadata_socket \ |