Fixes yamllint warnings which get added to merge requests

rackerlabs · Feb 29, 2024 · 0c6429d · 0c6429d
1 parent add540b
commit 0c6429d
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 32 deletions.
diff --git a/components/09-nautobot/kustomization.yaml b/components/09-nautobot/kustomization.yaml
@@ -8,13 +8,13 @@ resources:
 # can't use the helm chart until
 # https://github.com/nautobot/helm-charts/pull/356
 # is merged
-#helmGlobals:
-#  chartHome: ../../charts/
-#helmCharts:
-#- name: nautobot
-#  includeCRDs: true
-#  namespace: nautobot
-#  valuesFile: values.yaml
-#  releaseName: nautobot
-#  version: 2.0.5
-#  repo: https://nautobot.github.io/helm-charts/
+# helmGlobals:
+#   chartHome: ../../charts/
+# helmCharts:
+# - name: nautobot
+#   includeCRDs: true
+#   namespace: nautobot
+#   valuesFile: values.yaml
+#   releaseName: nautobot
+#   version: 2.0.5
+#   repo: https://nautobot.github.io/helm-charts/
diff --git a/components/10-keystone/aio-values.yaml b/components/10-keystone/aio-values.yaml
@@ -506,7 +506,7 @@ conf:
       # 12 hours
       expiration: 43200
     identity:
-      domain_specific_drivers_enabled: True
+      domain_specific_drivers_enabled: true
       domain_config_dir: /etc/keystone/domains
     fernet_tokens:
       key_repository: /etc/keystone/fernet-keys/
@@ -917,14 +917,6 @@ endpoints:
     namespace: null
     name: keystone
     auth:
-      admin:
-        region_name: RegionOne
-        username: admin
-        password: password
-        project_name: admin
-        user_domain_name: default
-        project_domain_name: default
-        default_domain_id: default
       # test:
       #   role: admin
       #   region_name: RegionOne
@@ -934,6 +926,14 @@ endpoints:
       #   user_domain_name: default
       #   project_domain_name: default
       #   default_domain_id: default
+      admin:
+        region_name: RegionOne
+        username: admin
+        password: password
+        project_name: admin
+        user_domain_name: default
+        project_domain_name: default
+        default_domain_id: default
     hosts:
       default: keystone
       internal: keystone-api

diff --git a/components/10-keystone/keystone-rabbitmq-queue.yaml b/components/10-keystone/keystone-rabbitmq-queue.yaml
@@ -6,10 +6,10 @@ metadata:
   namespace: openstack
 spec:
   tags:
-  - management # available tags are 'management', 'policymaker', 'monitoring' and 'administrator'
+  - management  # available tags are 'management', 'policymaker', 'monitoring' and 'administrator'
   - policymaker
   rabbitmqClusterReference:
-    name: rabbitmq # rabbitmqCluster must exist in the same namespace as this resource
+    name: rabbitmq  # rabbitmqCluster must exist in the same namespace as this resource
     namespace: openstack
   importCredentialsSecret:
     name: keystone-rabbitmq-password
@@ -20,10 +20,10 @@ metadata:
   name: keystone-vhost
   namespace: openstack
 spec:
-  name: "keystone" # vhost name; required and cannot be updated
-  defaultQueueType: quorum # default queue type for this vhost; require RabbitMQ version 3.11.12 or above
+  name: "keystone"  # vhost name; required and cannot be updated
+  defaultQueueType: quorum  # default queue type for this vhost; require RabbitMQ version 3.11.12 or above
   rabbitmqClusterReference:
-    name: rabbitmq # rabbitmqCluster must exist in the same namespace as this resource
+    name: rabbitmq  # rabbitmqCluster must exist in the same namespace as this resource
     namespace: openstack
 ---
 apiVersion: rabbitmq.com/v1beta1
@@ -32,13 +32,13 @@ metadata:
   name: keystone-queue
   namespace: openstack
 spec:
-  name: keystone-qq # name of the queue
-  vhost: "keystone" # default to '/' if not provided
-  type: quorum # without providing a queue type, rabbitmq creates a classic queue
+  name: keystone-qq  # name of the queue
+  vhost: "keystone"  # default to '/' if not provided
+  type: quorum  # without providing a queue type, rabbitmq creates a classic queue
   autoDelete: false
-  durable: true # seting 'durable' to false means this queue won't survive a server restart
+  durable: true  # seting 'durable' to false means this queue won't survive a server restart
   rabbitmqClusterReference:
-    name: rabbitmq # rabbitmqCluster must exist in the same namespace as this resource
+    name: rabbitmq  # rabbitmqCluster must exist in the same namespace as this resource
     namespace: openstack
 ---
 apiVersion: rabbitmq.com/v1beta1
@@ -47,13 +47,13 @@ metadata:
   name: keystone-permission
   namespace: openstack
 spec:
-  vhost: "keystone" # name of a vhost
+  vhost: "keystone"  # name of a vhost
   userReference:
-    name: "keystone" # name of a user.rabbitmq.com in the same namespace; must specify either spec.userReference or spec.user
+    name: "keystone"  # name of a user.rabbitmq.com in the same namespace; must specify either spec.userReference or spec.user
   permissions:
     write: ".*"
     configure: ".*"
     read: ".*"
   rabbitmqClusterReference:
-    name: rabbitmq # rabbitmqCluster must exist in the same namespace as this resource
+    name: rabbitmq  # rabbitmqCluster must exist in the same namespace as this resource
     namespace: openstack