9 files changed, 0 insertions, 148 deletions
diff --git a/ansible/roles/grafana/tasks/bootstrap.yml b/ansible/roles/grafana/tasks/bootstrap.yml
deleted file mode 100644
index 492b516e2..000000000
--- a/ansible/roles/grafana/tasks/bootstrap.yml
+++ /dev/null
@@ -1,38 +0,0 @@
----
-- name: Creating grafana 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='{{ grafana_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['grafana'][0] }}"
-
-- name: Reading json from variable
-  set_fact:
-    database_created: "{{ (database.stdout.split('localhost | SUCCESS => ')[1]|from_json).changed }}"
-
-- name: Creating grafana 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='{{ grafana_database_name }}'
-        password='{{ grafana_database_password }}'
-        host='%'
-        priv='{{ grafana_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['grafana'][0] }}"
diff --git a/ansible/roles/grafana/tasks/config.yml b/ansible/roles/grafana/tasks/config.yml
deleted file mode 100644
index ca3ddabc2..000000000
--- a/ansible/roles/grafana/tasks/config.yml
+++ /dev/null
@@ -1,27 +0,0 @@
----
-- name: Ensuring config directories exist
-  file:
-    path: "{{ node_config_directory }}/{{ item }}"
-    state: "directory"
-    recurse: yes
-  with_items:
-    - "grafana"
-
-- name: Copying over config.json files
-  template:
-    src: "{{ item }}.json.j2"
-    dest: "{{ node_config_directory }}/{{ item }}/config.json"
-  with_items:
-    - "grafana"
-
-- name: Copying over grafana.ini
-  merge_configs:
-    vars:
-      service_name: "{{ item }}"
-    sources:
-      - "{{ role_path }}/templates/grafana.ini.j2"
-      - "{{ node_custom_config }}/{{ item }}.ini"
-      - "{{ node_custom_config }}/grafana/{{ inventory_hostname }}/{{ item }}.ini"
-    dest: "{{ node_config_directory }}/grafana/grafana.ini"
-  with_items:
-    - "grafana"
diff --git a/ansible/roles/grafana/tasks/deploy.yml b/ansible/roles/grafana/tasks/deploy.yml
deleted file mode 100644
index 98b45ee90..000000000
--- a/ansible/roles/grafana/tasks/deploy.yml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-- include: config.yml
-  when: inventory_hostname in groups['grafana']
-
-- include: bootstrap.yml
-  when: inventory_hostname in groups['grafana']
-
-- include: start.yml
-  when: inventory_hostname in groups['grafana']
diff --git a/ansible/roles/grafana/tasks/main.yml b/ansible/roles/grafana/tasks/main.yml
deleted file mode 100644
index b017e8b4a..000000000
--- a/ansible/roles/grafana/tasks/main.yml
+++ /dev/null
@@ -1,2 +0,0 @@
----
-- include: "{{ action }}.yml"
diff --git a/ansible/roles/grafana/tasks/precheck.yml b/ansible/roles/grafana/tasks/precheck.yml
deleted file mode 100644
index ed97d539c..000000000
--- a/ansible/roles/grafana/tasks/precheck.yml
+++ /dev/null
@@ -1 +0,0 @@
----
diff --git a/ansible/roles/grafana/tasks/pull.yml b/ansible/roles/grafana/tasks/pull.yml
deleted file mode 100644
index 376892ab6..000000000
--- a/ansible/roles/grafana/tasks/pull.yml
+++ /dev/null
@@ -1,7 +0,0 @@
----
-- name: Pulling grafana image
-  kolla_docker:
-    action: "pull_image"
-    common_options: "{{ docker_common_options }}"
-    image: "{{ grafana_image_full }}"
-  when: inventory_hostname in groups['grafana']
diff --git a/ansible/roles/grafana/tasks/reconfigure.yml b/ansible/roles/grafana/tasks/reconfigure.yml
deleted file mode 100644
index b8ca4ed27..000000000
--- a/ansible/roles/grafana/tasks/reconfigure.yml
+++ /dev/null
@@ -1,47 +0,0 @@
----
-- name: Ensuring the containers up
-  kolla_docker:
-    name: "grafana"
-    action: "get_container_state"
-  register: container_state
-  failed_when: container_state.Running == false
-  when: inventory_hostname in groups['grafana']
-
-- include: config.yml
-
-- name: Check the configs
-  command: docker exec grafana /usr/local/bin/kolla_set_configs --check
-  changed_when: false
-  failed_when: false
-  register: check_results
-  when: inventory_hostname in groups['grafana']
-
-# 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: "grafana"
-    action: "get_container_env"
-  register: container_envs
-  when: inventory_hostname in groups['grafana']
-
-- name: Remove the containers
-  kolla_docker:
-    name: "grafana"
-    action: "remove_container"
-  register: remove_containers
-  when:
-    - config_strategy == "COPY_ONCE"
-    - inventory_hostname in groups['grafana']
-
-- include: start.yml
-  when: remove_containers.changed
-
-- name: Restart containers
-  kolla_docker:
-    name: "grafana"
-    action: "restart_container"
-  when:
-    - config_strategy == 'COPY_ALWAYS'
-    - inventory_hostname in groups['grafana']
diff --git a/ansible/roles/grafana/tasks/start.yml b/ansible/roles/grafana/tasks/start.yml
deleted file mode 100644
index 0d3114dab..000000000
--- a/ansible/roles/grafana/tasks/start.yml
+++ /dev/null
@@ -1,13 +0,0 @@
----
-- name: Starting grafana container
-  kolla_docker:
-    action: "start_container"
-    common_options: "{{ docker_common_options }}"
-    image: "{{ grafana_image_full }}"
-    name: "grafana"
-    volumes:
-      - "{{ node_config_directory }}/grafana/:{{ container_config_directory }}/:ro"
-      - "/etc/localtime:/etc/localtime:ro"
-      - "grafana:/var/lib/grafana/"
-      - "kolla_logs:/var/log/kolla/"
-  when: inventory_hostname in groups['grafana']
diff --git a/ansible/roles/grafana/tasks/upgrade.yml b/ansible/roles/grafana/tasks/upgrade.yml
deleted file mode 100644
index 1f16915ad..000000000
--- a/ansible/roles/grafana/tasks/upgrade.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-- include: config.yml
-
-- include: start.yml