Update openstack-enterprise inventory

bootstrap.sh

@@ -16,6 +16,9 @@
 export LC_ALL=C.UTF-8
 mkdir -p ~/.venvs
 
+BASEDIR=$(dirname $0)
+cd $BASEDIR || error "Could not change to $BASEDIR"
+
 source scripts/lib/functions.sh
 
 # Which config to bootstrap

openstack-enterprise/inventory-example.yaml

@@ -0,0 +1,50 @@
+# Inventory file for a small lab environment
+#
+all:
+  hosts:
+    controller1:
+      ansible_host: 10.240.0.51
+      access_ip: 10.240.0.51
+    controller2:
+      ansible_host: 10.240.0.52
+      access_ip: 10.240.0.52
+    controller3:
+      ansible_host: 10.240.0.53
+      access_ip: 10.240.0.53
+    worker1:
+      ansible_host: 10.240.0.54
+      access_ip: 10.240.0.54
+    worker2:
+      ansible_host: 10.240.0.55
+      access_ip: 10.240.0.55
+  children:
+    k8s_cluster:
+      vars:
+        cluster_name: cluster.local  # This clustername should be changed to match your environment domain name.
+      children:
+        kube_control_plane:  # all k8s control plane nodes need to be in this group
+          hosts:
+            controller1: null
+            controller2: null
+            controller3: null
+        etcd:  # all etcd nodes need to be in this group
+          hosts:
+            controller1: null
+            controller2: null
+            controller3: null
+        kube_node:  # all k8s enabled nodes need to be in this group
+          hosts:
+            controller1: null
+            controller2: null
+            controller3: null
+            worker1: null
+            worker2: null
+        openstack_control_plane:  # nodes used for nova compute labeled as openstack-control-plane=enabled
+          hosts:
+            controller1: null
+            controller2: null
+            controller3: null
+        openstack_compute_nodes:  # nodes used for nova compute labeled as openstack-compute-node=enabled
+          hosts:
+            worker1: null
+            worker2: null

openstack-flex/inventory-example.yaml

@@ -132,7 +132,7 @@ all:
                 storage-12481.rackerlabs.dev.local: null
                 storage-12562.rackerlabs.dev.local: null
                 storage-13461.rackerlabs.dev.local: null
-        nova_compute_nodes:  # nodes used for nova compute labeled as openstack-compute-node=enabled
+        openstack_compute_nodes:  # nodes used for nova compute labeled as openstack-compute-node=enabled
           hosts:
             compute-13461.rackerlabs.dev.local: null
             compute-12562.rackerlabs.dev.local: null

scripts/convert_osa_inventory.py

@@ -157,12 +157,12 @@ def main(debug=False, **kwargs):
                                     'openstack-compute-node': {
                                         'hosts': {}
                                         },
-                                    'k8s-cluster': {
+                                    'k8s_cluster': {
                                         'children': {
                                             'kube-master': {},
                                             'kube-node': {},
                                             'openstack_control_plane': {},
-                                            'openstack-compute-node': {},
+                                            'openstack_compute_node': {},
                                             }
                                         },
                                     'calico-rr': {