Rename folders

* copy -> defaults
* render -> custom
* roles -> ansible_roles

Change-Id: Ia96214691873f3bd8e6c5f9f433292fd912ac46e
Signed-off-by: Yujun Zhang <zhang.yujunz@zte.com.cn>

9 files changed, 0 insertions, 179 deletions

diff --git a/resources/roles/qtip-workspace/files/copy/fixtures/case.json b/resources/roles/qtip-workspace/files/copy/fixtures/case.json
deleted file mode 100644
index 22abc40f..00000000
--- a/resources/roles/qtip-workspace/files/copy/fixtures/case.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "run": "",
-  "name": "compute",
-  "ci_loop": "",
-  "tags": "",
-  "url": "",
-  "domains": "",
-  "dependencies": "",
-  "version": "",
-  "criteria": "",
-  "tier": "",
-  "blocking": "",
-  "description": ""
-}
\ No newline at end of file
diff --git a/resources/roles/qtip-workspace/files/copy/fixtures/pod.json b/resources/roles/qtip-workspace/files/copy/fixtures/pod.json
deleted file mode 100644
index 654b5828..00000000
--- a/resources/roles/qtip-workspace/files/copy/fixtures/pod.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "details": "",
-  "role": "",
-  "name": "qtip-pod",
-  "mode": ""
-}
\ No newline at end of file
diff --git a/resources/roles/qtip-workspace/files/copy/fixtures/project.json b/resources/roles/qtip-workspace/files/copy/fixtures/project.json
deleted file mode 100644
index ecd03e83..00000000
--- a/resources/roles/qtip-workspace/files/copy/fixtures/project.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "name": "qtip",
-  "description": "Platform Performance Benchmarking"
-}
\ No newline at end of file
diff --git a/resources/roles/qtip-workspace/files/copy/group_vars/.gitkeep b/resources/roles/qtip-workspace/files/copy/group_vars/.gitkeep
deleted file mode 100644
index e69de29b..00000000
--- a/resources/roles/qtip-workspace/files/copy/group_vars/.gitkeep
+++ /dev/null
diff --git a/resources/roles/qtip-workspace/files/copy/host_vars/.gitkeep b/resources/roles/qtip-workspace/files/copy/host_vars/.gitkeep
deleted file mode 100644
index e69de29b..00000000
--- a/resources/roles/qtip-workspace/files/copy/host_vars/.gitkeep
+++ /dev/null
diff --git a/resources/roles/qtip-workspace/files/copy/run.yml b/resources/roles/qtip-workspace/files/copy/run.yml
deleted file mode 100644
index d0f452aa..00000000
--- a/resources/roles/qtip-workspace/files/copy/run.yml
+++ /dev/null
@@ -1,71 +0,0 @@
-##############################################################################
-# Copyright (c) 2017 ZTE Corporation and others.
-#
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
-
----
-# Execute compute benchmark plan and collect data
-# - system information
-# - test condition
-# - performance metrics
-
-- hosts: compute
-
-  pre_tasks:
-
-  - name: check ssh connection
-    ping:
-
-  - name: create result directory
-    file:
-      path: "{{ qtip_results }}/{{ inventory_hostname }}"
-      state: directory
-    delegate_to: localhost
-
-  roles:
-  - qtip-deps
-
-  tags: [setup]
-
-
-- hosts: compute
-
-  roles:
-
-    - { role: inxi, tags: [inxi, sysinfo] }
-    - { role: unixbench, tags: [unixbench, float, int] }
-    - { role: openssl, tags: [openssl, ssl]}
-    - { role: nDPI, tags: [ndpi, dpi]}
-    - { role: ramspeed, tags: [ramspeed, mem]}
-
-  post_tasks:
-  - name: calculate QPI of compute
-    calculate:
-      metrics:
-        ssl_rsa: "{{ ssl_rsa_metrics }}"
-      spec:   "{{ qtip_resources }}/QPI/compute.yaml"
-    register: qpi_result
-    delegate_to: localhost
-    tags: [qpi]
-
-
-- hosts: localhost
-
-  pre_tasks:
-
-  - name: aggregate QPI results from all tested nodes
-    aggregate:
-      group: compute
-    register: pod_result
-    tags: [pod]
-
-  # Generate and publish report
-
-  roles:
-    - role: opnfv-testapi
-      action: report
-      when: testapi_url is defined
diff --git a/resources/roles/qtip-workspace/files/copy/setup.yml b/resources/roles/qtip-workspace/files/copy/setup.yml
deleted file mode 100644
index 5b4677e9..00000000
--- a/resources/roles/qtip-workspace/files/copy/setup.yml
+++ /dev/null
@@ -1,50 +0,0 @@
-##############################################################################
-# Copyright (c) 2017 ZTE Corporation and others.
-#
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
-
-# Prepare connection to SUT (System Under Test)
-- hosts: fuel-masters
-  gather_facts: no
-  tasks:
-  - name: collect facts of fuel hosts
-    fuel:
-
-- hosts: apex-underclouds
-  gather_facts: no
-
-  tasks:
-  - name: collect overcloud baremetal info
-    shell: . /root/stackrc && openstack baremetal list --fields instance_uuid properties provision_state --format json
-    register: baremetal_info
-  - name: collect overcloud server info
-    shell: . /root/stackrc && openstack server list --format json
-    register: server_info
-  - name: generate inventory
-    apex_generate_inventory:
-      baremetal_info: "{{ baremetal_info.stdout | from_json }}"
-      server_info: "{{ server_info.stdout | from_json }}"
-
-- hosts:
-  - fuel-masters
-  - apex-underclouds
-  tasks:
-  - name: update inventory file
-    template: src=templates/hosts dest=./hosts
-    delegate_to: localhost
-  - name: update ssh.cfg file
-    template: src=templates/ssh.cfg dest=./ssh.cfg
-    delegate_to: localhost
-
-- hosts: localhost
-  tasks:
-  - name: create cache directory
-    file:
-      path: "{{ item }}"
-      state: directory
-    with_items:
-      - "{{ qtip_cache }}"
diff --git a/resources/roles/qtip-workspace/files/copy/templates/hosts b/resources/roles/qtip-workspace/files/copy/templates/hosts
deleted file mode 100644
index 6779d6f4..00000000
--- a/resources/roles/qtip-workspace/files/copy/templates/hosts
+++ /dev/null
@@ -1,20 +0,0 @@
-localhost   ansible_connection=local
-
-[{{ installer_master_group[installer] }}]
-{{ installer_master_host }}
-
-[fuel-groups:children]
-{% for group in hosts|sort %}
-{{ group }}
-{% endfor %}
-
-[fuel-groups:vars]
-ansible_ssh_common_args=-F ./ssh.cfg
-
-{% for group in hosts|sort %}
-[{{ group }}]
-{% for host in hosts[group]|sort %}
-{{ host }}
-{% endfor %}
-
-{% endfor %}
diff --git a/resources/roles/qtip-workspace/files/copy/templates/ssh.cfg b/resources/roles/qtip-workspace/files/copy/templates/ssh.cfg
deleted file mode 100644
index 6c8968d3..00000000
--- a/resources/roles/qtip-workspace/files/copy/templates/ssh.cfg
+++ /dev/null
@@ -1,14 +0,0 @@
-# Connect to target node through jump host
-#
-# OpenSSH 7.3:
-#   ProxyJump jumphost
-# before OpenSSH 7.3
-#   ProxyCommand ssh -o 'ForwardAgent yes' jumphost 'ssh-add && nc %h %p'
-
-{% for (name, host) in hosts_meta.items() %}
-Host {{ name }}
-  HostName {{ host.ansible_ssh_host }}
-  User root
-  ProxyCommand ssh -o 'ForwardAgent yes' {{ installer_master_host }} 'ssh-add && nc %h %p'
-
-{% endfor %}