Merge "Drop vmtp"

README.rst

@@ -71,7 +71,6 @@ Kolla Ansible deploys containers for the following OpenStack projects:
 - `Tacker <https://docs.openstack.org/tacker/latest/>`__
 - `Trove <https://docs.openstack.org/trove/latest/>`__
 - `Vitrage <https://docs.openstack.org/vitrage/latest/>`__
-- `Vmtp <https://vmtp.readthedocs.io/en/latest/>`__
 - `Watcher <https://docs.openstack.org/watcher/latest/>`__
 - `Zun <https://docs.openstack.org/zun/latest/>`__
 

ansible/group_vars/all.yml

@@ -704,7 +704,6 @@ enable_telegraf: "no"
 enable_trove: "no"
 enable_trove_singletenant: "no"
 enable_vitrage: "no"
-enable_vmtp: "no"
 enable_watcher: "no"
 enable_zookeeper: "{{ enable_kafka | bool or enable_storm | bool }}"
 enable_zun: "no"

ansible/inventory/all-in-one

@@ -183,9 +183,6 @@ control
 [senlin:children]
 control
 
-[vmtp:children]
-control
-
 [trove:children]
 control
 

ansible/inventory/multinode

@@ -201,9 +201,6 @@ control
 [senlin:children]
 control
 
-[vmtp:children]
-control
-
 [vitrage:children]
 control
 

ansible/roles/vmtp/defaults/main.yml

@@ -1,44 +0,0 @@
----
-project_name: "vmtp"
-
-vmtp_services:
-  vmtp:
-    container_name: "vmtp"
-    image: "{{ vmtp_image_full }}"
-    enabled: true
-    group: "vmtp"
-    volumes: "{{ vmtp_default_volumes + vmtp_extra_volumes }}"
-    dimensions: "{{ vmtp_dimensions }}"
-
-####################
-# Docker
-####################
-vmtp_install_type: "{{ kolla_install_type }}"
-vmtp_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ vmtp_install_type }}-vmtp"
-vmtp_tag: "{{ openstack_tag }}"
-vmtp_image_full: "{{ vmtp_image }}:{{ vmtp_tag }}"
-vmtp_dimensions: "{{ default_container_dimensions }}"
-
-vmtp_default_volumes:
-  - "{{ node_config_directory }}/vmtp/:{{ container_config_directory }}/:ro"
-  - "/etc/localtime:/etc/localtime:ro"
-  - "{{ '/etc/timezone:/etc/timezone:ro' if ansible_facts.os_family == 'Debian' else '' }}"
-
-vmtp_extra_volumes: "{{ default_extra_volumes }}"
-
-#########################
-# VMTP Specific resources
-#########################
-vmtp_vm_availability_zone: "nova"
-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"

ansible/roles/vmtp/handlers/main.yml

@@ -1,15 +0,0 @@
----
-- name: Restart vmtp container
-  vars:
-    service_name: "vmtp"
-    service: "{{ vmtp_services[service_name] }}"
-  become: true
-  kolla_docker:
-    action: "recreate_or_restart_container"
-    common_options: "{{ docker_common_options }}"
-    name: "{{ service.container_name }}"
-    image: "{{ service.image }}"
-    volumes: "{{ service.volumes|reject('equalto', '')|list }}"
-    dimensions: "{{ service.dimensions }}"
-  when:
-    - kolla_action != "config"

ansible/roles/vmtp/tasks/check-containers.yml

@@ -1,16 +0,0 @@
----
-- name: Check vmtp containers
-  become: true
-  kolla_docker:
-    action: "compare_container"
-    common_options: "{{ docker_common_options }}"
-    name: "{{ item.value.container_name }}"
-    image: "{{ item.value.image }}"
-    volumes: "{{ item.value.volumes }}"
-    dimensions: "{{ item.value.dimensions }}"
-  when:
-    - inventory_hostname in groups[item.value.group]
-    - item.value.enabled | bool
-  with_dict: "{{ vmtp_services }}"
-  notify:
-    - "Restart {{ item.key }} container"

ansible/roles/vmtp/tasks/check.yml

@@ -1 +0,0 @@
----

ansible/roles/vmtp/tasks/config.yml

@@ -1,32 +0,0 @@
----
-- name: Ensuring config directories exist
-  file:
-    path: "{{ node_config_directory }}/{{ item.key }}"
-    state: "directory"
-    owner: "{{ config_owner_user }}"
-    group: "{{ config_owner_group }}"
-    mode: "0770"
-  become: true
-  when:
-    - inventory_hostname in groups[item.value.group]
-    - item.value.enabled | bool
-  with_dict: "{{ vmtp_services }}"
-
-- name: Copying over configuration file for vmtp
-  vars:
-    service: "{{ vmtp_services['vmtp'] }}"
-  merge_yaml:
-    sources:
-      - "{{ role_path }}/templates/{{ item }}.j2"
-      - "{{ node_custom_config }}/{{ item }}"
-      - "{{ node_custom_config }}/vmtp/{{ item }}"
-    dest: "{{ node_config_directory }}/vmtp/{{ item }}"
-    mode: "0660"
-  become: true
-  when:
-    - inventory_hostname in groups[service.group]
-    - service.enabled | bool
-  with_items:
-    - "cfg.default.yaml"
-  notify:
-    - Restart vmtp container

ansible/roles/vmtp/tasks/deploy-containers.yml

@@ -1,2 +0,0 @@
----
-- import_tasks: check-containers.yml

ansible/roles/vmtp/tasks/deploy.yml

@@ -1,7 +0,0 @@
----
-- import_tasks: config.yml
-
-- import_tasks: check-containers.yml
-
-- name: Flush handlers
-  meta: flush_handlers

ansible/roles/vmtp/tasks/main.yml

@@ -1,2 +0,0 @@
----
-- include_tasks: "{{ kolla_action }}.yml"

ansible/roles/vmtp/tasks/precheck.yml

@@ -1,6 +0,0 @@
----
-- import_role:
-    name: service-precheck
-  vars:
-    service_precheck_services: "{{ vmtp_services }}"
-    service_name: "{{ project_name }}"

ansible/roles/vmtp/tasks/pull.yml

@@ -1,3 +0,0 @@
----
-- import_role:
-    role: service-images-pull

ansible/roles/vmtp/tasks/reconfigure.yml

@@ -1,2 +0,0 @@
----
-- import_tasks: deploy.yml

ansible/roles/vmtp/tasks/stop.yml

@@ -1,6 +0,0 @@
----
-- import_role:
-    name: service-stop
-  vars:
-    project_services: "{{ vmtp_services }}"
-    service_name: "{{ project_name }}"

ansible/roles/vmtp/tasks/upgrade.yml

@@ -1,7 +0,0 @@
----
-- import_tasks: config.yml
-
-- import_tasks: check-containers.yml
-
-- name: Flush handlers
-  meta: flush_handlers

ansible/roles/vmtp/templates/cfg.default.yaml.j2

@@ -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 }}

ansible/site.yml

@@ -75,7 +75,6 @@
         - enable_telegraf_{{ enable_telegraf | bool }}
         - enable_trove_{{ enable_trove | bool }}
         - enable_vitrage_{{ enable_vitrage | bool }}
-        - enable_vmtp_{{ enable_vmtp | bool }}
         - enable_watcher_{{ enable_watcher | bool }}
         - enable_zookeeper_{{ enable_zookeeper | bool }}
         - enable_zun_{{ enable_zun | bool }}
@@ -952,17 +951,6 @@
         tags: designate,
         when: enable_designate | bool }
 
-- name: Apply role vmtp
-  gather_facts: false
-  hosts:
-    - vmtp
-    - '&enable_vmtp_True'
-  serial: '{{ kolla_serial|default("0") }}'
-  roles:
-    - { role: vmtp,
-        tags: vmtp,
-        when: enable_vmtp | bool }
-
 - name: Apply role trove
   gather_facts: false
   hosts:

etc/kolla/globals.yml

@@ -401,7 +401,6 @@
 #enable_trove: "no"
 #enable_trove_singletenant: "no"
 #enable_vitrage: "no"
-#enable_vmtp: "no"
 #enable_watcher: "no"
 #enable_zookeeper: "{{ enable_kafka | bool or enable_storm | bool }}"
 #enable_zun: "no"

releasenotes/notes/drop-vmtp-c2da7e8d513106c7.yaml

@@ -0,0 +1,8 @@
+---
+upgrade:
+  - |
+    Support for deploying ``vmtp`` has been dropped per the mailing list
+    notice.
+    The ``vmtp`` project is no longer buildable, is outside of the OpenStack
+    namespace and looks plain abandoned.
+    `See the mailing list notice <http://lists.openstack.org/pipermail/openstack-discuss/2021-December/026232.html>`__

tests/templates/inventory.j2

@@ -257,9 +257,6 @@ control
 [senlin:children]
 control
 
-[vmtp:children]
-control
-
 [vitrage:children]
 control