Merge pull request #635 from rebtoor/update_skel

[_skeleton_role_] year updated and fixes
openstack-k8s-operators · Apr 24, 2024 · 616af7b · 616af7b
2 parents 76edab9 + 5a80a70
commit 616af7b
Show file tree

Hide file tree

Showing 9 changed files with 33 additions and 47 deletions.
diff --git a/contribute/_skeleton_role_/defaults/main.yml.j2 b/contribute/_skeleton_role_/defaults/main.yml.j2
@@ -1,5 +1,5 @@
 ---
-# Copyright 2023 Red Hat, Inc.
+# Copyright 2024 Red Hat, Inc.
 # All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may

diff --git a/contribute/_skeleton_role_/handlers/main.yml b/contribute/_skeleton_role_/handlers/main.yml
@@ -1,5 +1,5 @@
 ---
-# Copyright 2023 Red Hat, Inc.
+# Copyright 2024 Red Hat, Inc.
 # All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may

diff --git a/contribute/_skeleton_role_/meta/main.yml.j2 b/contribute/_skeleton_role_/meta/main.yml.j2
@@ -1,5 +1,5 @@
 ---
-# Copyright 2023 Red Hat, Inc.
+# Copyright 2024 Red Hat, Inc.
 # All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may
@@ -21,7 +21,7 @@ galaxy_info:
   company: Red Hat
   license: Apache-2.0
   min_ansible_version: '2.14'
-  namespace: openstack
+  namespace: osp
   #
   # Provide a list of supported platforms, and for each platform a list of versions.
   # If you don't wish to enumerate all versions for a particular platform, use 'all'.

diff --git a/contribute/_skeleton_role_/molecule/default/collections.yml b/contribute/_skeleton_role_/molecule/default/collections.yml
@@ -0,0 +1,3 @@
+---
+collections:
+- name: community.general
diff --git a/contribute/_skeleton_role_/molecule/default/converge.yml.j2 b/contribute/_skeleton_role_/molecule/default/converge.yml.j2
@@ -1,5 +1,5 @@
 ---
-# Copyright 2023 Red Hat, Inc.
+# Copyright 2024 Red Hat, Inc.
 # All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may

diff --git a/contribute/_skeleton_role_/molecule/default/molecule.yml b/contribute/_skeleton_role_/molecule/default/molecule.yml
@@ -1,28 +1,30 @@
 ---
+dependency:
+  name: galaxy
+  options:
+    role-file: collections.yml
 driver:
   name: podman
-
+platforms:
+- command: /sbin/init
+  dockerfile: ../../../../molecule/common/Containerfile.j2
+  image: ${EDPM_ANSIBLE_MOLECULE_IMAGE:-"ubi9/ubi-init"}
+  name: instance
+  privileged: true
+  registry:
+    url: ${EDPM_ANSIBLE_MOLECULE_REGISTRY:-"registry.access.redhat.com"}
+  ulimits:
+  - host
 provisioner:
-  inventory:
-    hosts:
-      all:
-        hosts:
-          centos:
-            ansible_python_interpreter: /usr/bin/python3
-  name: ansible
   log: true
-  env:
-    ANSIBLE_STDOUT_CALLBACK: yaml
-
+  name: ansible
 scenario:
   test_sequence:
-    - destroy
-    - create
-    - prepare
-    - converge
-    - check
-    - verify
-    - destroy
-
+  - dependency
+  - destroy
+  - create
+  - prepare
+  - converge
+  - destroy
 verifier:
-  name: testinfra
+  name: ansible
diff --git a/contribute/_skeleton_role_/molecule/default/prepare.yml b/contribute/_skeleton_role_/molecule/default/prepare.yml
@@ -1,5 +1,5 @@
 ---
-# Copyright 2023 Red Hat, Inc.
+# Copyright 2024 Red Hat, Inc.
 # All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may

diff --git a/contribute/_skeleton_role_/tasks/main.yml.j2 b/contribute/_skeleton_role_/tasks/main.yml.j2
@@ -1,5 +1,5 @@
 ---
-# Copyright 2023 Red Hat, Inc.
+# Copyright 2024 Red Hat, Inc.
 # All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may
@@ -13,22 +13,3 @@
 # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 # License for the specific language governing permissions and limitations
 # under the License.
-
-
-# "{{ role_name }}" will search for and load any operating system variable file
-{% raw %}
-# found within the "vars/" path. If no OS files are found the task will skip.
-- name: Gather variables for each operating system
-  include_vars: "{{ item }}"
-  with_first_found:
-    - skip: true
-      files:
-        - "{{ ansible_facts['distribution'] | lower }}-{{ ansible_facts['distribution_version'] | lower }}.yml"
-        - "{{ ansible_facts['distribution'] | lower }}-{{ ansible_facts['distribution_major_version'] | lower }}.yml"
-        - "{{ ansible_facts['os_family'] | lower }}-{{ ansible_facts['distribution_major_version'] | lower }}.yml"
-        - "{{ ansible_facts['distribution'] | lower }}.yml"
-        - "{{ ansible_facts['os_family'] | lower }}-{{ ansible_facts['distribution_version'].split('.')[0] }}.yml"
-        - "{{ ansible_facts['os_family'] | lower }}.yml"
-  tags:
-    - always
-{% endraw %}
diff --git a/contribute/_skeleton_role_/vars/main.yml.j2 b/contribute/_skeleton_role_/vars/main.yml.j2
@@ -1,5 +1,5 @@
 ---
-# Copyright 2023 Red Hat, Inc.
+# Copyright 2024 Red Hat, Inc.
 # All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may