Rename install-podman to ensure-podman for consistency

The old role will be kept and include ensure-podman for backwards-compatability.

Change-Id: I21cfdfef4a88f66f51d139abed04f70b3228a22d

doc/source/container-roles.rst

@@ -8,6 +8,7 @@ Container Roles
 .. zuul:autorole:: ensure-docker
 .. zuul:autorole:: ensure-kubernetes
 .. zuul:autorole:: ensure-openshift
+.. zuul:autorole:: ensure-podman
 .. zuul:autorole:: install-docker
 .. zuul:autorole:: install-kubernetes
 .. zuul:autorole:: install-openshift

roles/build-container-image/common.rst

@@ -15,7 +15,7 @@ They all accept the same input data, principally a list of
 dictionaries representing the images to build.  YAML anchors_ can be
 used to supply the same data to all three jobs.
 
-Use the :zuul:role:`ensure-docker` or :zuul:role:`install-podman`
+Use the :zuul:role:`ensure-docker` or :zuul:role:`ensure-podman`
 role to install Docker or Podman before using these roles.
 
 **Role Variables**

roles/ensure-podman/README.rst

@@ -0,0 +1,4 @@
+Install podman container manager
+
+**Role Variables**
+

roles/ensure-podman/tasks/main.yaml

@@ -0,0 +1,8 @@
+- name: Find distribution installation
+  include: "{{ item }}"
+  static: no
+  with_first_found:
+    - "{{ ansible_distribution }}-{{ ansible_distribution_major_version }}.yaml"
+    - "{{ ansible_distribution }}.yaml"
+    - "{{ ansible_os_family }}.yaml"
+    - "default.yaml"

roles/install-podman/README.rst

@@ -1,4 +1 @@
-Install podman container manager
+.. warning:: Deprecated, use ensure-podman instead.
-
-**Role Variables**
-

roles/install-podman/tasks/main.yaml

@@ -1,8 +1,3 @@
-- name: Find distribution installation
+- name: Include ensure-podman
-  include: "{{ item }}"
+  include_role:
-  static: no
+    name: ensure-podman
-  with_first_found:
-    - "{{ ansible_distribution }}-{{ ansible_distribution_major_version }}.yaml"
-    - "{{ ansible_distribution }}.yaml"
-    - "{{ ansible_os_family }}.yaml"
-    - "default.yaml"

test-playbooks/ensure-podman/main.yaml

@@ -1,6 +1,6 @@
 - hosts: all
   roles:
-    - install-podman
+    - ensure-podman
 
 - hosts: all
   tasks:

zuul-tests.d/container-roles-jobs.yaml

@@ -102,7 +102,7 @@
     files:
       - roles/pull-from-intermediate-registry/.*
       - roles/push-to-intermediate-registry/.*
-      - roles/install-podman/.*
+      - roles/ensure-podman/.*
       - roles/build-container-image/.*
       - roles/run-buildset-registry/.*
       - roles/use-buildset-registry/.*
@@ -256,17 +256,17 @@
     post-run: test-playbooks/ensure-kubernetes/post.yaml
 
 - job:
-    name: zuul-jobs-test-install-podman
+    name: zuul-jobs-test-ensure-podman
     description: |
-      Test the install-podman role
+      Test the ensure-podman role
 
-      This job tests the install-podman role.  It is not meant to be
+      This job tests the ensure-podman role.  It is not meant to be
       used directly but rather run on changes to roles in the
       zuul-jobs repo.
     files:
-      - roles/install-podman/.*
+      - roles/ensure-podman/.*
-      - test-playbooks/install-podman/.*
+      - test-playbooks/ensure-podman/.*
-    run: test-playbooks/install-podman/main.yaml
+    run: test-playbooks/ensure-podman/main.yaml
 
 # -* AUTOGENERATED *-
 #  The following project section is autogenerated by
@@ -290,6 +290,6 @@
         - zuul-jobs-test-registry-buildset-registry-openshift-docker
         - zuul-jobs-test-ensure-kubernetes-docker
         - zuul-jobs-test-ensure-kubernetes-crio
-        - zuul-jobs-test-install-podman
+        - zuul-jobs-test-ensure-podman
     gate:
       jobs: *id001