diff options
Diffstat (limited to 'ansible')
| -rw-r--r-- | ansible/inventory/all-in-one | 3 | ||||
| -rw-r--r-- | ansible/inventory/multinode | 3 | ||||
| -rw-r--r-- | ansible/roles/manila/defaults/main.yml | 3 | ||||
| -rw-r--r-- | ansible/roles/manila/tasks/config.yml | 3 | ||||
| -rw-r--r-- | ansible/roles/manila/tasks/deploy.yml | 2 | ||||
| -rw-r--r-- | ansible/roles/manila/tasks/pull.yml | 7 | ||||
| -rw-r--r-- | ansible/roles/manila/tasks/reconfigure.yml | 5 | ||||
| -rw-r--r-- | ansible/roles/manila/tasks/start.yml | 14 | ||||
| -rw-r--r-- | ansible/roles/manila/templates/manila-data.json.j2 | 18 | ||||
| -rw-r--r-- | ansible/site.yml | 1 |
10 files changed, 59 insertions, 0 deletions
diff --git a/ansible/inventory/all-in-one b/ansible/inventory/all-in-one index b5ea09a38..d8ef9082e 100644 --- a/ansible/inventory/all-in-one +++ b/ansible/inventory/all-in-one @@ -239,6 +239,9 @@ manila [manila-share:children] storage +[manila-data:children] +storage + # Swift [swift-proxy-server:children] swift diff --git a/ansible/inventory/multinode b/ansible/inventory/multinode index 150af0e93..9580f6819 100644 --- a/ansible/inventory/multinode +++ b/ansible/inventory/multinode @@ -257,6 +257,9 @@ manila [manila-share:children] storage +[manila-data:children] +storage + # Swift [swift-proxy-server:children] swift diff --git a/ansible/roles/manila/defaults/main.yml b/ansible/roles/manila/defaults/main.yml index 05d7b833a..2ba966595 100644 --- a/ansible/roles/manila/defaults/main.yml +++ b/ansible/roles/manila/defaults/main.yml @@ -24,6 +24,9 @@ manila_api_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ dock manila_api_tag: "{{ openstack_release }}" manila_api_image_full: "{{ manila_api_image }}:{{ manila_api_tag }}" +manila_data_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ kolla_install_type }}-manila-data" +manila_data_tag: "{{ openstack_release }}" +manila_data_image_full: "{{ manila_data_image }}:{{ manila_data_tag }}" ##################### ## OpenStack diff --git a/ansible/roles/manila/tasks/config.yml b/ansible/roles/manila/tasks/config.yml index 4f83ff55b..e0a20f485 100644 --- a/ansible/roles/manila/tasks/config.yml +++ b/ansible/roles/manila/tasks/config.yml @@ -6,6 +6,7 @@ recurse: yes with_items: - "manila-api" + - "manila-data" - "manila-scheduler" - "manila-share" @@ -15,6 +16,7 @@ dest: "{{ node_config_directory }}/{{ item }}/config.json" with_items: - "manila-api" + - "manila-data" - "manila-scheduler" - "manila-share" @@ -33,6 +35,7 @@ dest: "{{ node_config_directory }}/{{ item }}/manila.conf" with_items: - "manila-api" + - "manila-data" - "manila-scheduler" - name: Copying over manila-share.conf diff --git a/ansible/roles/manila/tasks/deploy.yml b/ansible/roles/manila/tasks/deploy.yml index c4e32b6e4..37135a409 100644 --- a/ansible/roles/manila/tasks/deploy.yml +++ b/ansible/roles/manila/tasks/deploy.yml @@ -4,6 +4,7 @@ - include: config.yml when: inventory_hostname in groups['manila-api'] or + inventory_hostname in groups['manila-data'] or inventory_hostname in groups['manila-share'] or inventory_hostname in groups['manila-scheduler'] @@ -12,5 +13,6 @@ - include: start.yml when: inventory_hostname in groups['manila-api'] or + inventory_hostname in groups['manila-data'] or inventory_hostname in groups['manila-share'] or inventory_hostname in groups['manila-scheduler'] diff --git a/ansible/roles/manila/tasks/pull.yml b/ansible/roles/manila/tasks/pull.yml index 608646f69..520e29c08 100644 --- a/ansible/roles/manila/tasks/pull.yml +++ b/ansible/roles/manila/tasks/pull.yml @@ -19,3 +19,10 @@ common_options: "{{ docker_common_options }}" image: "{{ manila_share_image_full }}" when: inventory_hostname in groups['manila-share'] + +- name: Pulling manila-data image + kolla_docker: + action: "pull_image" + common_options: "{{ docker_common_options }}" + image: "{{ manila_data_image_full }}" + when: inventory_hostname in groups['manila-data'] diff --git a/ansible/roles/manila/tasks/reconfigure.yml b/ansible/roles/manila/tasks/reconfigure.yml index 3c265fb0d..90ab18104 100644 --- a/ansible/roles/manila/tasks/reconfigure.yml +++ b/ansible/roles/manila/tasks/reconfigure.yml @@ -8,6 +8,7 @@ when: inventory_hostname in groups[item.group] with_items: - { name: manila_api, group: manila-api } + - { name: manila_data, group: manila-data } - { name: manila_scheduler, group: manila-scheduler } - { name: manila_share, group: manila-share } @@ -21,6 +22,7 @@ when: inventory_hostname in groups[item.group] with_items: - { name: manila_api, group: manila-api } + - { name: manila_data, group: manila-data } - { name: manila_scheduler, group: manila-scheduler } - { name: manila_share, group: manila-share } @@ -35,6 +37,7 @@ when: inventory_hostname in groups[item.group] with_items: - { name: manila_api, group: manila-api } + - { name: manila_data, group: manila-data } - { name: manila_scheduler, group: manila-scheduler } - { name: manila_share, group: manila-share } @@ -49,6 +52,7 @@ - item[2]['rc'] == 1 with_together: - [{ name: manila_api, group: manila-api }, + { name: manila_data, group: manila-data }, { name: manila_scheduler, group: manila-scheduler }, { name: manila_share, group: manila-share }] - "{{ container_envs.results }}" @@ -68,6 +72,7 @@ - item[2]['rc'] == 1 with_together: - [{ name: manila_api, group: manila-api }, + { name: manila_data, group: manila-data }, { name: manila_scheduler, group: manila-scheduler }, { name: manila_share, group: manila-share }] - "{{ container_envs.results }}" diff --git a/ansible/roles/manila/tasks/start.yml b/ansible/roles/manila/tasks/start.yml index 7adaff712..103b9f506 100644 --- a/ansible/roles/manila/tasks/start.yml +++ b/ansible/roles/manila/tasks/start.yml @@ -36,3 +36,17 @@ - "/run/:/run/:shared" - "kolla_logs:/var/log/kolla/" when: inventory_hostname in groups['manila-share'] + +- name: Starting manila-data container + kolla_docker: + action: "start_container" + common_options: "{{ docker_common_options }}" + name: "manila_data" + image: "{{ manila_data_image_full }}" + privileged: True + volumes: + - "{{ node_config_directory }}/manila-data/:{{ container_config_directory }}/:ro" + - "/etc/localtime:/etc/localtime:ro" + - "/run/:/run/:shared" + - "kolla_logs:/var/log/kolla/" + when: inventory_hostname in groups['manila-data'] diff --git a/ansible/roles/manila/templates/manila-data.json.j2 b/ansible/roles/manila/templates/manila-data.json.j2 new file mode 100644 index 000000000..b5a8ce2bb --- /dev/null +++ b/ansible/roles/manila/templates/manila-data.json.j2 @@ -0,0 +1,18 @@ +{ + "command": "manila-data --config-file /etc/manila/manila.conf", + "config_files": [ + { + "source": "{{ container_config_directory }}/manila.conf", + "dest": "/etc/manila/manila.conf", + "owner": "manila", + "perm": "0600" + } + ], + "permissions": [ + { + "path": "/var/log/kolla/manila", + "owner": "manila:manila", + "recurse": true + } + ] +} diff --git a/ansible/site.yml b/ansible/site.yml index feeaed0e9..49f6f89d1 100644 --- a/ansible/site.yml +++ b/ansible/site.yml @@ -271,6 +271,7 @@ - hosts: - manila-api + - manila-data - manila-share - manila-scheduler serial: '{{ serial|default("0") }}' |