diff options
| author | Steven Dake <stdake@cisco.com> | 2016-11-15 19:01:25 -0700 |
|---|---|---|
| committer | Steven Dake <stdake@cisco.com> | 2016-11-15 21:34:17 -0700 |
| commit | 3fcef82946f7053affcfb0b1b3ef4292beb9fa95 (patch) | |
| tree | 0b9083d2cbf7d6c8d372de6b016419d6a719d424 /ansible/roles/tempest | |
| parent | 0963c2255a9718419c1cf8deaff350ea6ddc8472 (diff) | |
| download | kolla-3fcef82946f7053affcfb0b1b3ef4292beb9fa95.tar.gz kolla-3fcef82946f7053affcfb0b1b3ef4292beb9fa95.zip | |
Remove Ansible from Kolla
Change-Id: I5396e4b9927d3e65b6aa4185238a43a4765a996b
Diffstat (limited to 'ansible/roles/tempest')
| -rw-r--r-- | ansible/roles/tempest/defaults/main.yml | 23 | ||||
| -rw-r--r-- | ansible/roles/tempest/meta/main.yml | 3 | ||||
| -rw-r--r-- | ansible/roles/tempest/tasks/config.yml | 37 | ||||
| -rw-r--r-- | ansible/roles/tempest/tasks/deploy.yml | 4 | ||||
| -rw-r--r-- | ansible/roles/tempest/tasks/main.yml | 2 | ||||
| -rw-r--r-- | ansible/roles/tempest/tasks/precheck.yml | 1 | ||||
| -rw-r--r-- | ansible/roles/tempest/tasks/pull.yml | 6 | ||||
| -rw-r--r-- | ansible/roles/tempest/tasks/reconfigure.yml | 64 | ||||
| -rw-r--r-- | ansible/roles/tempest/tasks/start.yml | 11 | ||||
| -rw-r--r-- | ansible/roles/tempest/tasks/upgrade.yml | 4 | ||||
| -rw-r--r-- | ansible/roles/tempest/templates/tempest.conf.j2 | 73 | ||||
| -rw-r--r-- | ansible/roles/tempest/templates/tempest.json.j2 | 11 |
12 files changed, 0 insertions, 239 deletions
diff --git a/ansible/roles/tempest/defaults/main.yml b/ansible/roles/tempest/defaults/main.yml deleted file mode 100644 index cebab6c55..000000000 --- a/ansible/roles/tempest/defaults/main.yml +++ /dev/null @@ -1,23 +0,0 @@ ---- -project_name: "tempest" - - -######## -# Docker -######## -tempest_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ kolla_install_type }}-tempest" -tempest_tag: "{{ openstack_release }}" -tempest_image_full: "{{ tempest_image }}:{{ tempest_tag }}" - - -########################### -# Tempest Required Resource -########################### -image_url: "http://download.cirros-cloud.net/0.3.4/cirros-0.3.4-x86_64-disk.img" - -tempest_image_id: -tempest_image_alt_id: "{{ tempest_image_id }}" -tempest_flavor_ref_id: -tempest_flavor_ref_alt_id: "{{ tempest_flavor_ref_id }}" -tempest_public_network_id: -tempest_floating_network_name: diff --git a/ansible/roles/tempest/meta/main.yml b/ansible/roles/tempest/meta/main.yml deleted file mode 100644 index 6b4fff8fe..000000000 --- a/ansible/roles/tempest/meta/main.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- -dependencies: - - { role: common } diff --git a/ansible/roles/tempest/tasks/config.yml b/ansible/roles/tempest/tasks/config.yml deleted file mode 100644 index 6422270d3..000000000 --- a/ansible/roles/tempest/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: - - "tempest" - -- name: Copying over config.json files for services - template: - src: "{{ item }}.json.j2" - dest: "{{ node_config_directory }}/{{ item }}/config.json" - with_items: - - "tempest" - -- name: Copying over tempest.conf - merge_configs: - vars: - project_name: "tempest" - sources: - - "{{ role_path }}/templates/tempest.conf.j2" - - "{{ node_custom_config }}/tempest.conf" - dest: "{{ node_config_directory }}/{{ item }}/tempest.conf" - with_items: - - "tempest" - -- name: Check if policies shall be overwritten - local_action: stat path="{{ node_custom_config }}/tempest/policy.json" - register: tempest_policy - -- name: Copying over existing policy.json - template: - src: "{{ node_custom_config }}/tempest/policy.json" - dest: "{{ node_config_directory }}/tempest/policy.json" - when: - tempest_policy.stat.exists diff --git a/ansible/roles/tempest/tasks/deploy.yml b/ansible/roles/tempest/tasks/deploy.yml deleted file mode 100644 index 1f16915ad..000000000 --- a/ansible/roles/tempest/tasks/deploy.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- -- include: config.yml - -- include: start.yml diff --git a/ansible/roles/tempest/tasks/main.yml b/ansible/roles/tempest/tasks/main.yml deleted file mode 100644 index b017e8b4a..000000000 --- a/ansible/roles/tempest/tasks/main.yml +++ /dev/null @@ -1,2 +0,0 @@ ---- -- include: "{{ action }}.yml" diff --git a/ansible/roles/tempest/tasks/precheck.yml b/ansible/roles/tempest/tasks/precheck.yml deleted file mode 100644 index ed97d539c..000000000 --- a/ansible/roles/tempest/tasks/precheck.yml +++ /dev/null @@ -1 +0,0 @@ ---- diff --git a/ansible/roles/tempest/tasks/pull.yml b/ansible/roles/tempest/tasks/pull.yml deleted file mode 100644 index a31b62535..000000000 --- a/ansible/roles/tempest/tasks/pull.yml +++ /dev/null @@ -1,6 +0,0 @@ ---- -- name: Pulling tempest image - kolla_docker: - action: "pull_image" - common_options: "{{ docker_common_options }}" - image: "{{ tempest_image_full }}" diff --git a/ansible/roles/tempest/tasks/reconfigure.yml b/ansible/roles/tempest/tasks/reconfigure.yml deleted file mode 100644 index 0aeab552f..000000000 --- a/ansible/roles/tempest/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: tempest, group: tempest } - -- 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: tempest, group: tempest } - -# 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: tempest, group: tempest } - -- 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: tempest, group: tempest }] - - "{{ 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: tempest, group: tempest }] - - "{{ container_envs.results }}" - - "{{ check_results.results }}" diff --git a/ansible/roles/tempest/tasks/start.yml b/ansible/roles/tempest/tasks/start.yml deleted file mode 100644 index 97b6552c5..000000000 --- a/ansible/roles/tempest/tasks/start.yml +++ /dev/null @@ -1,11 +0,0 @@ ---- -- name: Starting tempest container - kolla_docker: - action: "start_container" - common_options: "{{ docker_common_options }}" - image: "{{ tempest_image_full }}" - name: "tempest" - volumes: - - "{{ node_config_directory }}/tempest/:{{ container_config_directory }}/:ro" - - "/etc/localtime:/etc/localtime:ro" - - "kolla_logs:/var/log/kolla/" diff --git a/ansible/roles/tempest/tasks/upgrade.yml b/ansible/roles/tempest/tasks/upgrade.yml deleted file mode 100644 index 1f16915ad..000000000 --- a/ansible/roles/tempest/tasks/upgrade.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- -- include: config.yml - -- include: start.yml diff --git a/ansible/roles/tempest/templates/tempest.conf.j2 b/ansible/roles/tempest/templates/tempest.conf.j2 deleted file mode 100644 index a0dc90cb5..000000000 --- a/ansible/roles/tempest/templates/tempest.conf.j2 +++ /dev/null @@ -1,73 +0,0 @@ -[DEFAULT] -debug = {{ openstack_logging_debug }} -log_file = tempest.log -use_stderr = False -log_dir = /var/log/kolla/tempest/ - -[auth] -admin_username = admin -admin_password = {{ keystone_admin_password }} -admin_project_name = admin -admin_domain_name = default - - -[dashboard] -dashboard_url = {{ internal_protocol }}://{{ kolla_internal_fqdn }} -login_url = {{ internal_protocol }}://{{ kolla_internal_fqdn }}/auth/login/ - -[service_available] -cinder = {{ enable_cinder }} -neutron = {{ enable_neutron }} -glance = {{ enable_glance }} -swift = {{ enable_swift }} -nova = {{ enable_nova }} -heat = {{ enable_heat }} -horizon = {{ enable_horizon }} -ceilometer = {{ enable_ceilometer }} - -[compute] -max_microversion = latest -image_ref = {{ tempest_image_id }} -image_ref_alt = {{ tempest_image_alt_id }} -flavor_ref = {{ tempest_flavor_ref_id }} -flavor_ref_alt = {{ tempest_flavor_ref_alt_id }} -region = {{ openstack_region_name }} - -[dashboard] -dashboard_url = {{ internal_protocol }}://{{ kolla_internal_fqdn }}/ -login_url = {{ internal_protocol }}://{{ kolla_internal_fqdn }}/auth/login - -[identity] -region = {{ openstack_region_name }} -auth_version = v3 -uri = {{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_admin_port }}/v2.0 -uri_v3 = {{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_admin_port }}/v3 - -[image] -region = {{ openstack_region_name }} -http_image = {{ image_url }} - -[network] -region = {{ openstack_region_name }} -public_network_id = {{ tempest_public_network_id }} -floating_network_name = {{ tempest_floating_network_name }} -project_networks_reachable = false - -[network-feature-enabled] -ipv6 = false - -[object-storage] -region = {{ openstack_region_name }} - -[orchestration] -region = {{ openstack_region_name }} - -[volume] -region = {{ openstack_region_name }} - -[volume-feature-enabled] -api_v1 = False - -[validation] -image_ssh_user = cirros -image_ssh_password = cubswin:) diff --git a/ansible/roles/tempest/templates/tempest.json.j2 b/ansible/roles/tempest/templates/tempest.json.j2 deleted file mode 100644 index 3ff5ea788..000000000 --- a/ansible/roles/tempest/templates/tempest.json.j2 +++ /dev/null @@ -1,11 +0,0 @@ -{ - "command": "sleep infinity", - "config_files":[ - { - "source": "{{ container_config_directory }}/tempest.conf", - "dest": "/etc/tempest/tempest.conf", - "owner": "root", - "perm": "0600" - } - ] -} |
