Merge "lxd: remove support"

etc/openstack_deploy/user_secrets.yml

@@ -141,9 +141,6 @@ nova_oslomsg_rpc_password:
 # your user variables.
 #nova_oslomsg_notify_password:
 
-# LXD Options for nova compute
-lxd_trust_password:
-
 ## Octavia Options
 octavia_container_mysql_password:
 octavia_service_password:

inventory/env.d/nova.yml

@@ -53,7 +53,6 @@ container_skel:
     belongs_to:
       - compute_containers
       - kvm-compute_containers
-      - lxd-compute_containers
       - qemu-compute_containers
       - powervm-compute_containers
     contains:
@@ -78,12 +77,6 @@ physical_skel:
   compute_hosts:
     belongs_to:
       - hosts
-  lxd-compute_containers:
-    belongs_to:
-      - all_containers
-  lxd-compute_hosts:
-    belongs_to:
-      - hosts
   kvm-compute_containers:
     belongs_to:
       - all_containers

inventory/group_vars/lxd-compute_hosts.yml

@@ -1,16 +0,0 @@
----
-# Copyright 2017, Logan Vig <logan2211@gmail.com>
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-nova_virt_type: lxd

playbooks/defaults/repo_packages/openstack_services.yml

@@ -212,13 +212,6 @@ nova_powervm_git_project_group: nova_all
 nova_powervm_git_track_branch: master
 
 
-## LXD Virt Driver
-nova_lxd_git_repo: https://opendev.org/openstack/nova-lxd
-nova_lxd_git_install_branch: 09ea20c6009ed7526dc54687bb91882cfb625ac3  # HEAD as of 14.07.2019
-nova_lxd_git_project_group: nova_all
-nova_lxd_git_track_branch: master # Not branched yet
-
-
 ## Sahara service
 sahara_git_repo: https://opendev.org/openstack/sahara
 sahara_git_install_branch: 1f4fc2001d07bd6ac3eb353d155b8823dfe2b601 # HEAD as of 14.07.2019

tests/test_inventory.py

@@ -270,8 +270,6 @@ class TestAnsibleInventoryFormatConstraints(unittest.TestCase):
         'log_containers',
         'log_hosts',
         'lxc_hosts',
-        'lxd-compute_containers',
-        'lxd-compute_hosts',
         'magnum',
         'magnum-infra_all',
         'magnum-infra_containers',