11 files changed, 0 insertions, 184 deletions
diff --git a/ansible/roles/vmtp/defaults/main.yml b/ansible/roles/vmtp/defaults/main.yml
deleted file mode 100644
index 1899d8be0..000000000
--- a/ansible/roles/vmtp/defaults/main.yml
+++ /dev/null
@@ -1,25 +0,0 @@
----
-project_name: "vmtp"
-
-####################
-# Docker
-####################
-vmtp_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ kolla_install_type }}-vmtp"
-vmtp_tag: "{{ openstack_release }}"
-vmtp_image_full: "{{ vmtp_image }}:{{ vmtp_tag }}"
-
-#########################
-# VMTP Specific resources
-#########################
-vmtp_vm_image_name: "Ubuntu Server 16.04"
-vmtp_vm_ssh_username: "ubuntu"
-vmtp_vm_flavor_type: "m1.small"
-vmtp_vm_nameservers: ['8.8.8.8', '8.8.4.4']
-vmtp_vm_image_url: "https://cloud-images.ubuntu.com/xenial/current/xenial-server-cloudimg-amd64-disk1.img"
-vmtp_internal_network_name: ['vmtp-demo-net']
-vmtp_internal_subnet_name: ['vmtp-demo-subnet']
-vmtp_internal_subnet_name_ipv6: ['vmtp-demo-v6-subnet']
-vmtp_internal_cidr: ['10.0.0.0/24']
-vmtp_internal_cidr_v6: ['2001:45::/64']
-vmtp_router_name: "pns-router"
-vmtp_os_dp_network: "physnet1"
diff --git a/ansible/roles/vmtp/meta/main.yml b/ansible/roles/vmtp/meta/main.yml
deleted file mode 100644
index 6b4fff8fe..000000000
--- a/ansible/roles/vmtp/meta/main.yml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-dependencies:
-  - { role: common }
diff --git a/ansible/roles/vmtp/tasks/config.yml b/ansible/roles/vmtp/tasks/config.yml
deleted file mode 100644
index c63c93e80..000000000
--- a/ansible/roles/vmtp/tasks/config.yml
+++ /dev/null
@@ -1,26 +0,0 @@
----
-- name: Ensuring config directories exist
-  file:
-    path: "{{ node_config_directory }}/vmtp"
-    state: "directory"
-    recurse: yes
-
-- name: Register binary python path
-  command: echo /usr/lib/python2.7/site-packages
-  register: python_path
-  when: kolla_install_type == 'binary'
-
-- name: Register source python path
-  command: echo /var/lib/kolla/venv/lib/python2.7/site-packages
-  register: python_path
-  when: kolla_install_type != 'binary'
-
-- name: Copying over configuration file for vmtp
-  merge_yaml:
-    sources:
-      - "{{ role_path }}/templates/{{ item }}.j2"
-      - "{{ node_custom_config }}/{{ item }}"
-      - "{{ node_custom_config }}/vmtp/{{ item }}"
-    dest: "{{ python_path }}/vmtp/{{ item }}"
-  with_items:
-    - "cfg.default.yaml"
diff --git a/ansible/roles/vmtp/tasks/deploy.yml b/ansible/roles/vmtp/tasks/deploy.yml
deleted file mode 100644
index d4daf108c..000000000
--- a/ansible/roles/vmtp/tasks/deploy.yml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-- include: config.yml
-  when: inventory_hostname in groups['vmtp']
-
-- include: start.yml
-  when: inventory_hostname in groups['vmtp']
diff --git a/ansible/roles/vmtp/tasks/main.yml b/ansible/roles/vmtp/tasks/main.yml
deleted file mode 100644
index b017e8b4a..000000000
--- a/ansible/roles/vmtp/tasks/main.yml
+++ /dev/null
@@ -1,2 +0,0 @@
----
-- include: "{{ action }}.yml"
diff --git a/ansible/roles/vmtp/tasks/precheck.yml b/ansible/roles/vmtp/tasks/precheck.yml
deleted file mode 100644
index ed97d539c..000000000
--- a/ansible/roles/vmtp/tasks/precheck.yml
+++ /dev/null
@@ -1 +0,0 @@
----
diff --git a/ansible/roles/vmtp/tasks/pull.yml b/ansible/roles/vmtp/tasks/pull.yml
deleted file mode 100644
index 0be3c5eec..000000000
--- a/ansible/roles/vmtp/tasks/pull.yml
+++ /dev/null
@@ -1,7 +0,0 @@
----
-- name: Pulling vmtp image
-  kolla_docker:
-    action: "pull_image"
-    common_options: "{{ docker_common_options }}"
-    image: "{{ vmtp_image_full }}"
-  when: inventory_hostname in groups['vmtp']
diff --git a/ansible/roles/vmtp/tasks/reconfigure.yml b/ansible/roles/vmtp/tasks/reconfigure.yml
deleted file mode 100644
index 3cf5f2940..000000000
--- a/ansible/roles/vmtp/tasks/reconfigure.yml
+++ /dev/null
@@ -1,58 +0,0 @@
----
-- name: Ensure container is up
-  kolla_docker:
-    name: "vmtp"
-    action: "get_container_state"
-  register: container_state
-  failed_when: container_state.Running == false
-  when: inventory_hostname in groups['vmtp']
-
-- include: config.yml
-
-- name: Check configuration
-  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['vmtp']
-  with_items:
-    - { name: vmtp, group: vmtp }
-
-# 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: "vmtp"
-    action: "get_container_env"
-  register: container_envs
-  when: inventory_hostname in groups['vmtp']
-
-- name: Remove the containers
-  kolla_docker:
-    name: "vmtp"
-    action: "remove_container"
-  register: remove_containers
-  when:
-    - config_strategy == "COPY_ONCE" or item[0]['KOLLA_CONFIG_STRATEGY'] == 'COPY_ONCE'
-    - item[1]['rc'] == 1
-    - inventory_hostname in groups['vmtp']
-  with_together:
-    - "{{ container_envs.results }}"
-    - "{{ check_results.results }}"
-
-- include: start.yml
-  when: remove_containers.changed
-
-- name: Restart containers
-  kolla_docker:
-    name: "vmtp"
-    action: "restart_container"
-  when:
-    - config_strategy == 'COPY_ALWAYS'
-    - item[0]['KOLLA_CONFIG_STRATEGY'] != 'COPY_ONCE'
-    - item[1]['rc'] == 1
-    - inventory_hostname in groups['vmtp']
-  with_together:
-    - "{{ container_envs.results }}"
-    - "{{ check_results.results }}"
diff --git a/ansible/roles/vmtp/tasks/start.yml b/ansible/roles/vmtp/tasks/start.yml
deleted file mode 100644
index c3a2b19b7..000000000
--- a/ansible/roles/vmtp/tasks/start.yml
+++ /dev/null
@@ -1,11 +0,0 @@
----
-- name: Starting vmtp container
-  kolla_docker:
-    action: "start_container"
-    common_options: "{{ docker_common_options }}"
-    image: "{{ vmtp_image_full }}"
-    name: "vmtp"
-    volumes:
-      - "{{ node_config_directory }}/vmtp/:{{ container_config_directory }}/:ro"
-      - "/etc/localtime:/etc/localtime:ro"
-      - "kolla_logs:/var/log/kolla"
diff --git a/ansible/roles/vmtp/tasks/upgrade.yml b/ansible/roles/vmtp/tasks/upgrade.yml
deleted file mode 100644
index 1f16915ad..000000000
--- a/ansible/roles/vmtp/tasks/upgrade.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-- include: config.yml
-
-- include: start.yml
diff --git a/ansible/roles/vmtp/templates/cfg.default.yaml.j2 b/ansible/roles/vmtp/templates/cfg.default.yaml.j2
deleted file mode 100644
index 991c86c69..000000000
--- a/ansible/roles/vmtp/templates/cfg.default.yaml.j2
+++ /dev/null
@@ -1,41 +0,0 @@
-image_name: {{ vmtp_vm_image_name }}
-ssh_vm_username: {{ vmtp_vm_ssh_username }}
-flavor_type: {{ vmtp_vm_flavor_type }}
-availability_zone: {{ vmtp_vm_availability_zone }}
-dns_nameservers: {{ vmtp_vm_nameservers }}
-vm_image_url: {{ vmtp_vm_image_url }}
-
-reuse_network_name:
-floating_ip: True
-reuse_existing_vm:
-config_drive:
-user_data_file:
-ipv6_mode:
-router_name:  {{ vmtp_router_name }}
-
-internal_network_name: {{ vmtp_internal_network_name }}
-internal_subnet_name: {{ vmtp_internal_subnet_name }}
-internal_subnet_name_ipv6: {{ vmtp_internal_subnet_name_ipv6 }}
-internal_cidr: {{ vmtp_internal_cidr }}
-internal_cidr_v6: {{ vmtp_internal_cidr_v6 }}
-
-public_key_file:
-private_key_file:
-public_key_name: 'pns_public_key'
-vm_name_server:  'TestServer'
-vm_name_client:   'TestClient'
-security_group_name: 'pns-security'
-
-ping_count: 2
-ping_pass_threshold: 80
-ssh_retry_count: 50
-generic_retry_count: 50
-
-tcp_tp_loop_count: 3
-tcp_pkt_sizes: [65536]
-udp_pkt_sizes: [128, 1024, 8192]
-icmp_pkt_sizes: [64, 391, 1500]
-udp_loss_rate_range: [2, 5]
-
-vm_bandwidth: 0
-os_dataplane_network: {{ vmtp_os_dp_network }}