diff options
Diffstat (limited to 'ansible/roles/rally')
| -rw-r--r-- | ansible/roles/rally/defaults/main.yml | 18 | ||||
| -rw-r--r-- | ansible/roles/rally/meta/main.yml | 3 | ||||
| -rw-r--r-- | ansible/roles/rally/tasks/bootstrap.yml | 41 | ||||
| -rw-r--r-- | ansible/roles/rally/tasks/bootstrap_service.yml | 20 | ||||
| -rw-r--r-- | ansible/roles/rally/tasks/config.yml | 37 | ||||
| -rw-r--r-- | ansible/roles/rally/tasks/deploy.yml | 4 | ||||
| -rw-r--r-- | ansible/roles/rally/tasks/main.yml | 2 | ||||
| -rw-r--r-- | ansible/roles/rally/tasks/precheck.yml | 1 | ||||
| -rw-r--r-- | ansible/roles/rally/tasks/pull.yml | 6 | ||||
| -rw-r--r-- | ansible/roles/rally/tasks/reconfigure.yml | 64 | ||||
| -rw-r--r-- | ansible/roles/rally/tasks/start.yml | 11 | ||||
| -rw-r--r-- | ansible/roles/rally/tasks/upgrade.yml | 6 | ||||
| -rw-r--r-- | ansible/roles/rally/templates/rally.conf.j2 | 9 | ||||
| -rw-r--r-- | ansible/roles/rally/templates/rally.json.j2 | 18 |
14 files changed, 0 insertions, 240 deletions
diff --git a/ansible/roles/rally/defaults/main.yml b/ansible/roles/rally/defaults/main.yml deleted file mode 100644 index ced0999cb..000000000 --- a/ansible/roles/rally/defaults/main.yml +++ /dev/null @@ -1,18 +0,0 @@ ---- -project_name: "rally" - - -######## -# Docker -######## -rally_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ kolla_install_type }}-rally" -rally_tag: "{{ openstack_release }}" -rally_image_full: "{{ rally_image }}:{{ rally_tag }}" - - -#################### -# Database -#################### -rally_database_name: "rally" -rally_database_user: "rally" -rally_database_address: "{{ kolla_internal_fqdn }}:{{ database_port }}" diff --git a/ansible/roles/rally/meta/main.yml b/ansible/roles/rally/meta/main.yml deleted file mode 100644 index 6b4fff8fe..000000000 --- a/ansible/roles/rally/meta/main.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- -dependencies: - - { role: common } diff --git a/ansible/roles/rally/tasks/bootstrap.yml b/ansible/roles/rally/tasks/bootstrap.yml deleted file mode 100644 index 9875c3e57..000000000 --- a/ansible/roles/rally/tasks/bootstrap.yml +++ /dev/null @@ -1,41 +0,0 @@ ---- -- name: Creating rally 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='{{ rally_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['rally'][0] }}" - -- name: Reading json from variable - set_fact: - database_created: "{{ (database.stdout.split('localhost | SUCCESS => ')[1]|from_json).changed }}" - -- name: Creating rally 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='{{ rally_database_name }}' - password='{{ rally_database_password }}' - host='%' - priv='{{ rally_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['rally'][0] }}" - -- include: bootstrap_service.yml - when: database_created diff --git a/ansible/roles/rally/tasks/bootstrap_service.yml b/ansible/roles/rally/tasks/bootstrap_service.yml deleted file mode 100644 index 47a7c8f7f..000000000 --- a/ansible/roles/rally/tasks/bootstrap_service.yml +++ /dev/null @@ -1,20 +0,0 @@ ---- -- name: Running rally bootstrap container - kolla_docker: - action: "start_container" - common_options: "{{ docker_common_options }}" - detach: False - environment: - KOLLA_BOOTSTRAP: - KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}" - image: "{{ rally_image_full }}" - labels: - BOOTSTRAP: - name: "bootstrap_rally" - restart_policy: "never" - volumes: - - "{{ node_config_directory }}/rally/:{{ container_config_directory }}/:ro" - - "/etc/localtime:/etc/localtime:ro" - - "kolla_logs:/var/log/kolla/" - run_once: True - delegate_to: "{{ groups['rally'][0] }}" diff --git a/ansible/roles/rally/tasks/config.yml b/ansible/roles/rally/tasks/config.yml deleted file mode 100644 index 3304915de..000000000 --- a/ansible/roles/rally/tasks/config.yml +++ /dev/null @@ -1,37 +0,0 @@ ---- -- name: Ensuring config directories exist - file: - path: "{{ node_config_directory }}/{{ item }}" - state: "directory" - recurse: yes - with_items: - - "rally" - -- name: Copying over config.json files for services - template: - src: "{{ item }}.json.j2" - dest: "{{ node_config_directory }}/{{ item }}/config.json" - with_items: - - "rally" - -- name: Copying over rally.conf - merge_configs: - vars: - project_name: "rally" - sources: - - "{{ role_path }}/templates/rally.conf.j2" - - "{{ node_custom_config }}/rally.conf" - dest: "{{ node_config_directory }}/{{ item }}/rally.conf" - with_items: - - "rally" - -- name: Check if policies shall be overwritten - local_action: stat path="{{ node_custom_config }}/rally/policy.json" - register: rally_policy - -- name: Copying over existing policy.json - template: - src: "{{ node_custom_config }}/rally/policy.json" - dest: "{{ node_config_directory }}/rally/policy.json" - when: - rally_policy.stat.exists diff --git a/ansible/roles/rally/tasks/deploy.yml b/ansible/roles/rally/tasks/deploy.yml deleted file mode 100644 index 1dc8c04e3..000000000 --- a/ansible/roles/rally/tasks/deploy.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- -- include: config.yml -- include: bootstrap.yml -- include: start.yml diff --git a/ansible/roles/rally/tasks/main.yml b/ansible/roles/rally/tasks/main.yml deleted file mode 100644 index b017e8b4a..000000000 --- a/ansible/roles/rally/tasks/main.yml +++ /dev/null @@ -1,2 +0,0 @@ ---- -- include: "{{ action }}.yml" diff --git a/ansible/roles/rally/tasks/precheck.yml b/ansible/roles/rally/tasks/precheck.yml deleted file mode 100644 index ed97d539c..000000000 --- a/ansible/roles/rally/tasks/precheck.yml +++ /dev/null @@ -1 +0,0 @@ ---- diff --git a/ansible/roles/rally/tasks/pull.yml b/ansible/roles/rally/tasks/pull.yml deleted file mode 100644 index bcada160d..000000000 --- a/ansible/roles/rally/tasks/pull.yml +++ /dev/null @@ -1,6 +0,0 @@ ---- -- name: Pulling rally image - kolla_docker: - action: "pull_image" - common_options: "{{ docker_common_options }}" - image: "{{ rally_image_full }}" diff --git a/ansible/roles/rally/tasks/reconfigure.yml b/ansible/roles/rally/tasks/reconfigure.yml deleted file mode 100644 index 79c3dde5a..000000000 --- a/ansible/roles/rally/tasks/reconfigure.yml +++ /dev/null @@ -1,64 +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: rally, group: rally } - -- 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: rally, group: rally } - -# 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: rally, group: rally } - -- name: Remove the containers - kolla_docker: - name: "{{ item[0]['name'] }}" - action: "remove_container" - register: remove_containers - when: - - config_strategy == "COPY_ONCE" or item[1]['KOLLA_CONFIG_STRATEGY'] == 'COPY_ONCE' - - item[2]['rc'] == 1 - - inventory_hostname in groups[item[0]['group']] - with_together: - - [{ name: rally, group: rally }] - - "{{ 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: - - config_strategy == 'COPY_ALWAYS' - - item[1]['KOLLA_CONFIG_STRATEGY'] != 'COPY_ONCE' - - item[2]['rc'] == 1 - - inventory_hostname in groups[item[0]['group']] - with_together: - - [{ name: rally, group: rally }] - - "{{ container_envs.results }}" - - "{{ check_results.results }}" diff --git a/ansible/roles/rally/tasks/start.yml b/ansible/roles/rally/tasks/start.yml deleted file mode 100644 index f95000fa1..000000000 --- a/ansible/roles/rally/tasks/start.yml +++ /dev/null @@ -1,11 +0,0 @@ ---- -- name: Starting rally container - kolla_docker: - action: "start_container" - common_options: "{{ docker_common_options }}" - image: "{{ rally_image_full }}" - name: "rally" - volumes: - - "{{ node_config_directory }}/rally/:{{ container_config_directory }}/:ro" - - "/etc/localtime:/etc/localtime:ro" - - "kolla_logs:/var/log/kolla/" diff --git a/ansible/roles/rally/tasks/upgrade.yml b/ansible/roles/rally/tasks/upgrade.yml deleted file mode 100644 index 308053080..000000000 --- a/ansible/roles/rally/tasks/upgrade.yml +++ /dev/null @@ -1,6 +0,0 @@ ---- -- include: config.yml - -- include: bootstrap_service.yml - -- include: start.yml diff --git a/ansible/roles/rally/templates/rally.conf.j2 b/ansible/roles/rally/templates/rally.conf.j2 deleted file mode 100644 index 853751871..000000000 --- a/ansible/roles/rally/templates/rally.conf.j2 +++ /dev/null @@ -1,9 +0,0 @@ -[DEFAULT] -debug = {{ openstack_logging_debug }} -log_file = rally.log -use_stderr = False -log_dir = /var/log/kolla/rally/ - -[database] -connection = mysql+pymysql://{{ rally_database_user }}:{{ rally_database_password }}@{{ rally_database_address }}/{{ rally_database_name }} -max_retries = -1 diff --git a/ansible/roles/rally/templates/rally.json.j2 b/ansible/roles/rally/templates/rally.json.j2 deleted file mode 100644 index 3db0d8810..000000000 --- a/ansible/roles/rally/templates/rally.json.j2 +++ /dev/null @@ -1,18 +0,0 @@ -{ - "command": "sleep infinity", - "config_files":[ - { - "source": "{{ container_config_directory }}/rally.conf", - "dest": "/etc/rally/rally.conf", - "owner": "rally", - "perm": "0600" - } - ], - "permissions": [ - { - "path": "/var/log/kolla/rally", - "owner": "rally:rally", - "recurse": true - } - ] -} |
