diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-01-21 00:50:01 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-01-21 00:50:01 +0000 |
| commit | b11421166cfb6ec9815b8badc1e9150cacebf02a (patch) | |
| tree | df18f0b599aaaf9e19e3a0202dcd55cec3b528df /ansible | |
| parent | d3756de84cc4556d964f3eae4028d7c9e68b9e12 (diff) | |
| parent | ef971bff5135b88e3451eb451418327e672f6d8b (diff) | |
| download | kolla-b11421166cfb6ec9815b8badc1e9150cacebf02a.tar.gz kolla-b11421166cfb6ec9815b8badc1e9150cacebf02a.zip | |
Merge "Fix permissions to /var/lib/nova/"
Diffstat (limited to 'ansible')
| -rw-r--r-- | ansible/roles/nova/tasks/bootstrap.yml | 29 | ||||
| -rw-r--r-- | ansible/roles/nova/tasks/deploy.yml | 3 | ||||
| -rw-r--r-- | ansible/roles/nova/tasks/start.yml | 5 |
3 files changed, 33 insertions, 4 deletions
diff --git a/ansible/roles/nova/tasks/bootstrap.yml b/ansible/roles/nova/tasks/bootstrap.yml index 16e2500c5..fcdd2a707 100644 --- a/ansible/roles/nova/tasks/bootstrap.yml +++ b/ansible/roles/nova/tasks/bootstrap.yml @@ -50,3 +50,32 @@ run_once: True delegate_to: "{{ groups['nova-api'][0] }}" when: database_created + +- 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: Starting 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 }}" + name: "bootstrap_nova_compute" + restart_policy: "never" + volumes: + - "{{ node_config_directory }}/nova-compute/:{{ container_config_directory }}/:ro" + - "nova_compute:/var/lib/nova/" + when: + - inventory_hostname in groups['compute'] + - not enable_nova_fake | bool + - nova_compute_volume.changed diff --git a/ansible/roles/nova/tasks/deploy.yml b/ansible/roles/nova/tasks/deploy.yml index f72e6e219..13a5dba8f 100644 --- a/ansible/roles/nova/tasks/deploy.yml +++ b/ansible/roles/nova/tasks/deploy.yml @@ -27,7 +27,8 @@ - inventory_hostname in groups['compute'] - include: bootstrap.yml - when: inventory_hostname in groups['nova-api'] + when: inventory_hostname in groups['nova-api'] or + inventory_hostname in groups['compute'] - include: start.yml when: inventory_hostname in groups['compute'] or diff --git a/ansible/roles/nova/tasks/start.yml b/ansible/roles/nova/tasks/start.yml index e97455c8e..4df7f4d84 100644 --- a/ansible/roles/nova/tasks/start.yml +++ b/ansible/roles/nova/tasks/start.yml @@ -10,9 +10,8 @@ volumes: - "{{ node_config_directory }}/nova-libvirt/:{{ container_config_directory }}/:ro" - "/lib/modules:/lib/modules:ro" - - "/run:/run" - "/sys/fs/cgroup:/sys/fs/cgroup" - - "nova_compute:/var/lib/nova/instances" + - "nova_compute:/var/lib/nova/" - "nova_libvirt:/var/lib/libvirt" when: inventory_hostname in groups['compute'] @@ -100,7 +99,7 @@ - "/lib/modules:/lib/modules:ro" - "/run:/run" - "/var/lib/kolla/dev/log:/dev/log" - - "nova_compute:/var/lib/nova/instances" + - "nova_compute:/var/lib/nova/" - "nova_libvirt:/var/lib/libvirt" when: - inventory_hostname in groups['compute'] |
