11 files changed, 0 insertions, 363 deletions
diff --git a/ansible/roles/manila/tasks/bootstrap.yml b/ansible/roles/manila/tasks/bootstrap.yml
deleted file mode 100644
index 0d51963b0..000000000
--- a/ansible/roles/manila/tasks/bootstrap.yml
+++ /dev/null
@@ -1,41 +0,0 @@
----
-- name: Creating Manila database
-  command: docker exec -t kolla_toolbox /usr/bin/ansible localhost
-    -m mysql_db
-    -a "login_host='{{ database_address }}'
-        login_port='{{ database_port }}'
-        login_user='{{ database_user }}'
-        login_password='{{ database_password }}'
-        name='{{ manila_database_name }}'"
-  register: database
-  changed_when: "{{ database.stdout.find('localhost | SUCCESS => ') != -1 and
-                    (database.stdout.split('localhost | SUCCESS => ')[1]|from_json).changed }}"
-  failed_when: database.stdout.split()[2] != 'SUCCESS'
-  run_once: True
-  delegate_to: "{{ groups['manila-api'][0] }}"
-
-- name: Reading json from variable
-  set_fact:
-    database_created: "{{ (database.stdout.split('localhost | SUCCESS => ')[1]|from_json).changed }}"
-
-- name: Creating Manila database user and setting permissions
-  command: docker exec -t kolla_toolbox /usr/bin/ansible localhost
-    -m mysql_user
-    -a "login_host='{{ database_address }}'
-        login_port='{{ database_port }}'
-        login_user='{{ database_user }}'
-        login_password='{{ database_password }}'
-        name='{{ manila_database_name }}'
-        password='{{ manila_database_password }}'
-        host='%'
-        priv='{{ manila_database_name }}.*:ALL'
-        append_privs='yes'"
-  register: database_user_create
-  changed_when: "{{ database_user_create.stdout.find('localhost | SUCCESS => ') != -1 and
-                    (database_user_create.stdout.split('localhost | SUCCESS => ')[1]|from_json).changed }}"
-  failed_when: database_user_create.stdout.split()[2] != 'SUCCESS'
-  run_once: True
-  delegate_to: "{{ groups['manila-api'][0] }}"
-
-- include: bootstrap_service.yml
-  when: database_created
diff --git a/ansible/roles/manila/tasks/bootstrap_service.yml b/ansible/roles/manila/tasks/bootstrap_service.yml
deleted file mode 100644
index 501e6062b..000000000
--- a/ansible/roles/manila/tasks/bootstrap_service.yml
+++ /dev/null
@@ -1,20 +0,0 @@
----
-- name: Running Manila bootstrap container
-  kolla_docker:
-    action: "start_container"
-    common_options: "{{ docker_common_options }}"
-    detach: False
-    environment:
-      KOLLA_BOOTSTRAP:
-      KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}"
-    image: "{{ manila_api_image_full }}"
-    labels:
-      BOOTSTRAP:
-    name: "bootstrap_manila"
-    restart_policy: "never"
-    volumes:
-      - "{{ node_config_directory }}/manila-api/:{{ container_config_directory }}/:ro"
-      - "kolla_logs:/var/log/kolla/"
-      - "/etc/localtime:/etc/localtime:ro"
-  run_once: True
-  delegate_to: "{{ groups['manila-api'][0] }}"
diff --git a/ansible/roles/manila/tasks/config.yml b/ansible/roles/manila/tasks/config.yml
deleted file mode 100644
index c975cdd75..000000000
--- a/ansible/roles/manila/tasks/config.yml
+++ /dev/null
@@ -1,73 +0,0 @@
----
-- name: Ensuring config directories exist
-  file:
-    path: "{{ node_config_directory }}/{{ item }}"
-    state: "directory"
-    recurse: yes
-  with_items:
-    - "manila-api"
-    - "manila-data"
-    - "manila-scheduler"
-    - "manila-share"
-
-- name: Copying over config.json files for services
-  template:
-    src: "{{ item }}.json.j2"
-    dest: "{{ node_config_directory }}/{{ item }}/config.json"
-  with_items:
-    - "manila-api"
-    - "manila-data"
-    - "manila-scheduler"
-    - "manila-share"
-
-- name: Copying over manila.conf
-  merge_configs:
-    vars:
-      service_name: "{{ item }}"
-    sources:
-      - "{{ role_path }}/templates/manila.conf.j2"
-      - "{{ node_custom_config }}/global.conf"
-      - "{{ node_custom_config }}/database.conf"
-      - "{{ node_custom_config }}/messaging.conf"
-      - "{{ node_custom_config }}/manila.conf"
-      - "{{ node_custom_config }}/manila/{{ item }}.conf"
-      - "{{ node_custom_config }}/manila/{{ inventory_hostname }}/manila.conf"
-    dest: "{{ node_config_directory }}/{{ item }}/manila.conf"
-  with_items:
-    - "manila-api"
-    - "manila-data"
-    - "manila-scheduler"
-
-- name: Copying over manila-share.conf
-  merge_configs:
-    vars:
-      service_name: "{{ item }}"
-    sources:
-      - "{{ role_path }}/templates/manila.conf.j2"
-      - "{{ role_path }}/templates/manila-share.conf.j2"
-      - "{{ node_custom_config }}/global.conf"
-      - "{{ node_custom_config }}/database.conf"
-      - "{{ node_custom_config }}/messaging.conf"
-      - "{{ node_custom_config }}/manila.conf"
-      - "{{ node_custom_config }}/{{ item }}.conf"
-      - "{{ node_custom_config }}/manila/{{ item }}.conf"
-      - "{{ node_custom_config }}/manila/{{ inventory_hostname }}/manila.conf"
-    dest: "{{ node_config_directory }}/{{ item }}/manila.conf"
-  with_items:
-    - "manila-share"
-
-- name: Check if policies shall be overwritten
-  local_action: stat path="{{ node_custom_config }}/manila/policy.json"
-  register: manila_policy
-
-- name: Copying over existing policy.json
-  template:
-    src: "{{ node_custom_config }}/manila/policy.json"
-    dest: "{{ node_config_directory }}/{{ item }}/policy.json"
-  with_items:
-    - "manila-api"
-    - "manila-data"
-    - "manila-scheduler"
-    - "manila-share"
-  when:
-    manila_policy.stat.exists
diff --git a/ansible/roles/manila/tasks/deploy.yml b/ansible/roles/manila/tasks/deploy.yml
deleted file mode 100644
index 37135a409..000000000
--- a/ansible/roles/manila/tasks/deploy.yml
+++ /dev/null
@@ -1,18 +0,0 @@
----
-- include: register.yml
-  when: inventory_hostname in groups['manila-api']
-
-- 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']
-
-- include: bootstrap.yml
-  when: inventory_hostname in groups['manila-api']
-
-- 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/main.yml b/ansible/roles/manila/tasks/main.yml
deleted file mode 100644
index b017e8b4a..000000000
--- a/ansible/roles/manila/tasks/main.yml
+++ /dev/null
@@ -1,2 +0,0 @@
----
-- include: "{{ action }}.yml"
diff --git a/ansible/roles/manila/tasks/precheck.yml b/ansible/roles/manila/tasks/precheck.yml
deleted file mode 100644
index ed97d539c..000000000
--- a/ansible/roles/manila/tasks/precheck.yml
+++ /dev/null
@@ -1 +0,0 @@
----
diff --git a/ansible/roles/manila/tasks/pull.yml b/ansible/roles/manila/tasks/pull.yml
deleted file mode 100644
index 520e29c08..000000000
--- a/ansible/roles/manila/tasks/pull.yml
+++ /dev/null
@@ -1,28 +0,0 @@
----
-- name: Pulling manila-api image
-  kolla_docker:
-    action: "pull_image"
-    common_options: "{{ docker_common_options }}"
-    image: "{{ manila_api_image_full }}"
-  when: inventory_hostname in groups['manila-api']
-
-- name: Pulling manila-scheduler image
-  kolla_docker:
-    action: "pull_image"
-    common_options: "{{ docker_common_options }}"
-    image: "{{ manila_scheduler_image_full }}"
-  when: inventory_hostname in groups['manila-scheduler']
-
-- name: Pulling manila-share image
-  kolla_docker:
-    action: "pull_image"
-    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
deleted file mode 100644
index 90ab18104..000000000
--- a/ansible/roles/manila/tasks/reconfigure.yml
+++ /dev/null
@@ -1,79 +0,0 @@
----
-- name: Ensuring the containers up
-  kolla_docker:
-    name: "{{ item.name }}"
-    action: "get_container_state"
-  register: container_state
-  failed_when: container_state.Running == false
-  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 }
-
-- include: config.yml
-
-- name: Check the configs
-  command: docker exec {{ item.name }} /usr/local/bin/kolla_set_configs --check
-  changed_when: false
-  failed_when: false
-  register: check_results
-  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 }
-
-# NOTE(jeffrey4l): when config_strategy == 'COPY_ALWAYS'
-# and container env['KOLLA_CONFIG_STRATEGY'] == 'COPY_ONCE',
-# just remove the container and start again
-- name: Containers config strategy
-  kolla_docker:
-    name: "{{ item.name }}"
-    action: "get_container_env"
-  register: container_envs
-  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 }
-
-- name: Remove the containers
-  kolla_docker:
-    name: "{{ item[0]['name'] }}"
-    action: "remove_container"
-  register: remove_containers
-  when:
-    - inventory_hostname in groups[item[0]['group']]
-    - config_strategy == "COPY_ONCE" or item[1]['KOLLA_CONFIG_STRATEGY'] == 'COPY_ONCE'
-    - 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 }}"
-    - "{{ check_results.results }}"
-
-- include: start.yml
-  when: remove_containers.changed
-
-- name: Restart containers
-  kolla_docker:
-    name: "{{ item[0]['name'] }}"
-    action: "restart_container"
-  when:
-    - inventory_hostname in groups[item[0]['group']]
-    - config_strategy == 'COPY_ALWAYS'
-    - item[1]['KOLLA_CONFIG_STRATEGY'] != 'COPY_ONCE'
-    - 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 }}"
-    - "{{ check_results.results }}"
diff --git a/ansible/roles/manila/tasks/register.yml b/ansible/roles/manila/tasks/register.yml
deleted file mode 100644
index a804b3215..000000000
--- a/ansible/roles/manila/tasks/register.yml
+++ /dev/null
@@ -1,43 +0,0 @@
----
-- name: Creating the Manila service and endpoint
-  command: docker exec -t kolla_toolbox /usr/bin/ansible localhost
-    -m kolla_keystone_service
-    -a "service_name={{ item.service_name }}
-        service_type={{ item.service_type }}
-        description='Openstack Shared Filesystems'
-        endpoint_region={{ openstack_region_name }}
-        url='{{ item.url }}'
-        interface='{{ item.interface }}'
-        region_name={{ openstack_region_name }}
-        auth={{ '{{ openstack_manila_auth }}' }}"
-    -e  "{'openstack_manila_auth':{{ openstack_manila_auth }}}"
-  register: manila_endpoint
-  changed_when: "{{ manila_endpoint.stdout.find('localhost | SUCCESS => ') != -1 and (manila_endpoint.stdout.split('localhost | SUCCESS => ')[1]|from_json).changed }}"
-  until: manila_endpoint.stdout.split()[2] == 'SUCCESS'
-  retries: 10
-  delay: 5
-  run_once: True
-  with_items:
-    - {'interface': 'admin', 'url': '{{ manila_admin_endpoint }}', 'service_name': 'manila', 'service_type': 'share'}
-    - {'interface': 'internal', 'url': '{{ manila_internal_endpoint }}', 'service_name': 'manila', 'service_type': 'share'}
-    - {'interface': 'public', 'url': '{{ manila_public_endpoint }}', 'service_name': 'manila', 'service_type': 'share'}
-    - {'interface': 'admin', 'url': '{{ manila_v2_admin_endpoint }}', 'service_name': 'manilav2', 'service_type': 'sharev2'}
-    - {'interface': 'internal', 'url': '{{ manila_v2_internal_endpoint }}', 'service_name': 'manilav2', 'service_type': 'sharev2'}
-    - {'interface': 'public', 'url': '{{ manila_v2_public_endpoint }}', 'service_name': 'manilav2', 'service_type': 'sharev2'}
-
-- name: Creating the Manila project, user and role
-  command: docker exec -t kolla_toolbox /usr/bin/ansible localhost
-    -m kolla_keystone_user
-    -a "project=service
-        user=manila
-        password={{ manila_keystone_password }}
-        role=admin
-        region_name={{ openstack_region_name }}
-        auth={{ '{{ openstack_manila_auth }}' }}"
-    -e "{'openstack_manila_auth':{{ openstack_manila_auth }}}"
-  register: manila_user
-  changed_when: "{{ manila_user.stdout.find('localhost | SUCCESS => ') != -1 and (manila_user.stdout.split('localhost | SUCCESS => ')[1]|from_json).changed }}"
-  until: manila_user.stdout.split()[2] == 'SUCCESS'
-  retries: 10
-  delay: 5
-  run_once: True
diff --git a/ansible/roles/manila/tasks/start.yml b/ansible/roles/manila/tasks/start.yml
deleted file mode 100644
index 103b9f506..000000000
--- a/ansible/roles/manila/tasks/start.yml
+++ /dev/null
@@ -1,52 +0,0 @@
----
-- name: Starting manila-api container
-  kolla_docker:
-    action: "start_container"
-    common_options: "{{ docker_common_options }}"
-    name: "manila_api"
-    image: "{{ manila_api_image_full }}"
-    volumes:
-      - "{{ node_config_directory }}/manila-api/:{{ container_config_directory }}/:ro"
-      - "/etc/localtime:/etc/localtime:ro"
-      - "kolla_logs:/var/log/kolla/"
-  when: inventory_hostname in groups['manila-api']
-
-- name: Starting manila-scheduler container
-  kolla_docker:
-    action: "start_container"
-    common_options: "{{ docker_common_options }}"
-    name: "manila_scheduler"
-    image: "{{ manila_scheduler_image_full }}"
-    volumes:
-      - "{{ node_config_directory }}/manila-scheduler/:{{ container_config_directory }}/:ro"
-      - "/etc/localtime:/etc/localtime:ro"
-      - "kolla_logs:/var/log/kolla/"
-  when: inventory_hostname in groups['manila-scheduler']
-
-- name: Starting manila-share container
-  kolla_docker:
-    action: "start_container"
-    common_options: "{{ docker_common_options }}"
-    name: "manila_share"
-    image: "{{ manila_share_image_full }}"
-    privileged: True
-    volumes:
-      - "{{ node_config_directory }}/manila-share/:{{ container_config_directory }}/:ro"
-      - "/etc/localtime:/etc/localtime:ro"
-      - "/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/tasks/upgrade.yml b/ansible/roles/manila/tasks/upgrade.yml
deleted file mode 100644
index 308053080..000000000
--- a/ansible/roles/manila/tasks/upgrade.yml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-- include: config.yml
-
-- include: bootstrap_service.yml
-
-- include: start.yml