diff --git a/README.rst b/README.rst index be2e40a19e..fdd1e1293e 100644 --- a/README.rst +++ b/README.rst @@ -71,7 +71,6 @@ Kolla Ansible deploys containers for the following OpenStack projects: - `Tacker `__ - `Trove `__ - `Vitrage `__ -- `Vmtp `__ - `Watcher `__ - `Zun `__ diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml index e52d876f04..f192562852 100644 --- a/ansible/group_vars/all.yml +++ b/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" diff --git a/ansible/inventory/all-in-one b/ansible/inventory/all-in-one index 69167e2d04..42f903b08c 100644 --- a/ansible/inventory/all-in-one +++ b/ansible/inventory/all-in-one @@ -183,9 +183,6 @@ control [senlin:children] control -[vmtp:children] -control - [trove:children] control diff --git a/ansible/inventory/multinode b/ansible/inventory/multinode index 9bbc69242d..24de4a233c 100644 --- a/ansible/inventory/multinode +++ b/ansible/inventory/multinode @@ -201,9 +201,6 @@ control [senlin:children] control -[vmtp:children] -control - [vitrage:children] control diff --git a/ansible/roles/vmtp/defaults/main.yml b/ansible/roles/vmtp/defaults/main.yml deleted file mode 100644 index 122da92d1d..0000000000 --- a/ansible/roles/vmtp/defaults/main.yml +++ /dev/null @@ -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" diff --git a/ansible/roles/vmtp/handlers/main.yml b/ansible/roles/vmtp/handlers/main.yml deleted file mode 100644 index e0e3f4f2db..0000000000 --- a/ansible/roles/vmtp/handlers/main.yml +++ /dev/null @@ -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" diff --git a/ansible/roles/vmtp/tasks/check-containers.yml b/ansible/roles/vmtp/tasks/check-containers.yml deleted file mode 100644 index f10bdcff5b..0000000000 --- a/ansible/roles/vmtp/tasks/check-containers.yml +++ /dev/null @@ -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" diff --git a/ansible/roles/vmtp/tasks/check.yml b/ansible/roles/vmtp/tasks/check.yml deleted file mode 100644 index ed97d539c0..0000000000 --- a/ansible/roles/vmtp/tasks/check.yml +++ /dev/null @@ -1 +0,0 @@ ---- diff --git a/ansible/roles/vmtp/tasks/config.yml b/ansible/roles/vmtp/tasks/config.yml deleted file mode 100644 index b0c1ac7d77..0000000000 --- a/ansible/roles/vmtp/tasks/config.yml +++ /dev/null @@ -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 diff --git a/ansible/roles/vmtp/tasks/deploy-containers.yml b/ansible/roles/vmtp/tasks/deploy-containers.yml deleted file mode 100644 index eb24ab5c7a..0000000000 --- a/ansible/roles/vmtp/tasks/deploy-containers.yml +++ /dev/null @@ -1,2 +0,0 @@ ---- -- import_tasks: check-containers.yml diff --git a/ansible/roles/vmtp/tasks/deploy.yml b/ansible/roles/vmtp/tasks/deploy.yml deleted file mode 100644 index 49edff81e3..0000000000 --- a/ansible/roles/vmtp/tasks/deploy.yml +++ /dev/null @@ -1,7 +0,0 @@ ---- -- import_tasks: config.yml - -- import_tasks: check-containers.yml - -- name: Flush handlers - meta: flush_handlers diff --git a/ansible/roles/vmtp/tasks/main.yml b/ansible/roles/vmtp/tasks/main.yml deleted file mode 100644 index bc5d1e6257..0000000000 --- a/ansible/roles/vmtp/tasks/main.yml +++ /dev/null @@ -1,2 +0,0 @@ ---- -- include_tasks: "{{ kolla_action }}.yml" diff --git a/ansible/roles/vmtp/tasks/precheck.yml b/ansible/roles/vmtp/tasks/precheck.yml deleted file mode 100644 index a0f3087b66..0000000000 --- a/ansible/roles/vmtp/tasks/precheck.yml +++ /dev/null @@ -1,6 +0,0 @@ ---- -- import_role: - name: service-precheck - vars: - service_precheck_services: "{{ vmtp_services }}" - service_name: "{{ project_name }}" diff --git a/ansible/roles/vmtp/tasks/pull.yml b/ansible/roles/vmtp/tasks/pull.yml deleted file mode 100644 index 53f9c5fda1..0000000000 --- a/ansible/roles/vmtp/tasks/pull.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- -- import_role: - role: service-images-pull diff --git a/ansible/roles/vmtp/tasks/reconfigure.yml b/ansible/roles/vmtp/tasks/reconfigure.yml deleted file mode 100644 index 5b10a7e111..0000000000 --- a/ansible/roles/vmtp/tasks/reconfigure.yml +++ /dev/null @@ -1,2 +0,0 @@ ---- -- import_tasks: deploy.yml diff --git a/ansible/roles/vmtp/tasks/stop.yml b/ansible/roles/vmtp/tasks/stop.yml deleted file mode 100644 index 9af17b721a..0000000000 --- a/ansible/roles/vmtp/tasks/stop.yml +++ /dev/null @@ -1,6 +0,0 @@ ---- -- import_role: - name: service-stop - vars: - project_services: "{{ vmtp_services }}" - service_name: "{{ project_name }}" diff --git a/ansible/roles/vmtp/tasks/upgrade.yml b/ansible/roles/vmtp/tasks/upgrade.yml deleted file mode 100644 index 49edff81e3..0000000000 --- a/ansible/roles/vmtp/tasks/upgrade.yml +++ /dev/null @@ -1,7 +0,0 @@ ---- -- import_tasks: config.yml - -- import_tasks: check-containers.yml - -- name: Flush handlers - meta: flush_handlers 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 991c86c698..0000000000 --- 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 }} diff --git a/ansible/site.yml b/ansible/site.yml index 59f4a415a3..d6f1786eeb 100644 --- a/ansible/site.yml +++ b/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: diff --git a/etc/kolla/globals.yml b/etc/kolla/globals.yml index e26d02ce3c..1b409ae35d 100644 --- a/etc/kolla/globals.yml +++ b/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" diff --git a/releasenotes/notes/drop-vmtp-c2da7e8d513106c7.yaml b/releasenotes/notes/drop-vmtp-c2da7e8d513106c7.yaml new file mode 100644 index 0000000000..381d3c475f --- /dev/null +++ b/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 `__ diff --git a/tests/templates/inventory.j2 b/tests/templates/inventory.j2 index 3b90c5237a..bea292a621 100644 --- a/tests/templates/inventory.j2 +++ b/tests/templates/inventory.j2 @@ -257,9 +257,6 @@ control [senlin:children] control -[vmtp:children] -control - [vitrage:children] control