Merge "powervm: drop un-used vars"

inventory/env.d/nova.yml

@@ -54,7 +54,6 @@ container_skel:
       - compute_containers
       - kvm-compute_containers
       - qemu-compute_containers
-      - powervm-compute_containers
     contains:
       - neutron_linuxbridge_agent
       - neutron_openvswitch_agent
@@ -88,10 +87,4 @@ physical_skel:
       - all_containers
   qemu-compute_hosts:
     belongs_to:
-      - hosts
-  powervm-compute_containers:
-    belongs_to:
-      - all_containers
-  powervm-compute_hosts:
-    belongs_to:
-      - hosts
+      - hosts

inventory/group_vars/powervm-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: powervm

playbooks/defaults/repo_packages/openstack_services.yml

@@ -205,13 +205,6 @@ nova_git_project_group: nova_all
 nova_git_track_branch: master
 
 
-## PowerVM Virt Driver
-nova_powervm_git_repo: https://opendev.org/openstack/nova-powervm
-nova_powervm_git_install_branch: bf68706a837af97452bd5caf388cb61bed197ad5  # HEAD as of 14.07.2019
-nova_powervm_git_project_group: nova_all
-nova_powervm_git_track_branch: master
-
-
 ## 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

@@ -334,8 +334,6 @@ class TestAnsibleInventoryFormatConstraints(unittest.TestCase):
         'policy_all',
         'policy_containers',
         'policy_hosts',
-        'powervm-compute_containers',
-        'powervm-compute_hosts',
         'qemu-compute_containers',
         'qemu-compute_hosts',
         'reservation_all',