diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-09-01 16:45:57 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-09-01 16:45:57 +0000 |
| commit | b6c40d9deb40404aa83b9e391d12ab1de3eae720 (patch) | |
| tree | 93caf2a9f3a67d7a10388eb5270a426a1b963c45 | |
| parent | f85ac43be40c71f30cc95f79fbc9952e860f8e15 (diff) | |
| parent | 2b741eb8703fd7886764107b05741c8415751991 (diff) | |
| download | kolla-b6c40d9deb40404aa83b9e391d12ab1de3eae720.tar.gz kolla-b6c40d9deb40404aa83b9e391d12ab1de3eae720.zip | |
Merge "Create the nova instances directory when need during starting"
| -rw-r--r-- | ansible/roles/nova/tasks/bootstrap_service.yml | 33 | ||||
| -rw-r--r-- | docker/nova/nova-compute/extend_start.sh | 5 |
2 files changed, 1 insertions, 37 deletions
diff --git a/ansible/roles/nova/tasks/bootstrap_service.yml b/ansible/roles/nova/tasks/bootstrap_service.yml index c3bcebf7d..33ce56728 100644 --- a/ansible/roles/nova/tasks/bootstrap_service.yml +++ b/ansible/roles/nova/tasks/bootstrap_service.yml @@ -18,36 +18,3 @@ - "kolla_logs:/var/log/kolla/" run_once: True delegate_to: "{{ groups['nova-api'][0] }}" - -- name: Creating nova-compute volume - kolla_docker: - action: "create_volume" - common_options: "{{ docker_common_options }}" - name: "nova_compute" - register: nova_compute_volume - when: - - inventory_hostname in groups['compute'] - - not enable_nova_fake | bool - -- name: Running Nova compute bootstrap container - kolla_docker: - action: "start_container" - common_options: "{{ docker_common_options }}" - detach: False - environment: - KOLLA_BOOTSTRAP: - KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}" - image: "{{ nova_compute_image_full }}" - labels: - BOOTSTRAP: - name: "bootstrap_nova_compute" - restart_policy: "never" - volumes: - - "{{ node_config_directory }}/nova-compute/:{{ container_config_directory }}/:ro" - - "/etc/localtime:/etc/localtime:ro" - - "kolla_logs:/var/log/kolla/" - - "nova_compute:/var/lib/nova/" - when: - - inventory_hostname in groups['compute'] - - not enable_nova_fake | bool - - nova_compute_volume.changed diff --git a/docker/nova/nova-compute/extend_start.sh b/docker/nova/nova-compute/extend_start.sh index 76226cd90..a458625ec 100644 --- a/docker/nova/nova-compute/extend_start.sh +++ b/docker/nova/nova-compute/extend_start.sh @@ -1,8 +1,5 @@ #!/bin/bash -# Bootstrap and exit if KOLLA_BOOTSTRAP variable is set. This catches all cases -# of the KOLLA_BOOTSTRAP variable being set, including empty. -if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then +if [[ ! -d /var/lib/nova/instances ]]; then mkdir -p /var/lib/nova/instances - exit 0 fi |