Merge "Fail and direct user to use ensure-* version of roles"

roles/install-devstack/tasks/main.yaml

@@ -1,3 +1,3 @@
-- name: Include ensure-devstack
+- name: Error if used
-  include_role:
+  fail:
-    name: ensure-devstack
+    msg: This role has been renamed. Please use ensure-devstack instead.

roles/install-docker/tasks/main.yaml

@@ -1,5 +1,3 @@
----
+- name: Error if used
-
+  fail:
-- name: Import ensure-docker
+    msg: This role has been renamed. Please use ensure-docker instead.
-  include_role:
-    name: ensure-docker

roles/install-go/tasks/main.yaml

@@ -1,3 +1,3 @@
-- name: Include ensure-go
+- name: Error if used
-  include_role:
+  fail:
-    name: ensure-go
+    msg: This role has been renamed. Please use ensure-go instead.

roles/install-if-python/tasks/main.yaml

@@ -1,3 +1,3 @@
-- name: Include ensure-if-python.
+- name: Error if used
-  include_role:
+  fail:
-    name: ensure-if-python
+    msg: This role has been renamed. Please use ensure-if-python instead.

roles/install-javascript-packages/defaults/main.yaml

@@ -1,3 +0,0 @@
-npm_environment:
-  DISPLAY: ':99'
-zuul_work_dir: "{{ zuul.project.src_dir }}"

roles/install-javascript-packages/tasks/main.yaml

@@ -1,3 +1,3 @@
-- name: Include ensure-javascript-packages
+- name: Error if used
-  include_role:
+  fail:
-    name: ensure-javascript-packages
+    msg: This role has been renamed. Please use ensure-javascript-packages instead.

roles/install-kubernetes/tasks/main.yaml

@@ -1,3 +1,3 @@
-- name: Include ensure-kubernetes
+- name: Error if used
-  include_role:
+  fail:
-    name: ensure-kubernetes
+    msg: This role has been renamed. Please use ensure-kubernetes instead.

roles/install-nodejs/defaults/main.yaml

@@ -1,2 +0,0 @@
----
-node_version: 6

roles/install-nodejs/files/00-nodesource.pref

@@ -1,3 +0,0 @@
-Package: nodejs
-Pin: origin deb.nodesource.com
-Pin-Priority: 900

roles/install-nodejs/tasks/main.yaml

@@ -1,3 +1,3 @@
-- name: Include ensure-nodejs.
+- name: Error if used
-  include_role:
+  fail:
-    name: ensure-nodejs
+    msg: This role has been renamed. Please use ensure-nodejs instead.

roles/install-nodejs/templates/nodejs.pref.j2

@@ -1,3 +0,0 @@
-Package: nodejs
-Pin: origin deb.nodesource.com
-Pin-Priority: 900

roles/install-openshift/tasks/main.yaml

@@ -1,3 +1,3 @@
-- name: Include ensure-openshift
+- name: Error if used
-  include_role:
+  fail:
-    name: ensure-openshift
+    msg: This role has been renamed. Please use ensure-openshift instead.

roles/install-pdk-dependencies/tasks/main.yaml

@@ -1,3 +1,3 @@
-- name: Include ensure-pdk-dependencies.
+- name: Error if used
-  include_role:
+  fail:
-    name: ensure-pdk-dependencies
+    msg: This role has been renamed. Please use ensure-pdk-dependencies instead.

roles/install-podman/tasks/main.yaml

@@ -1,3 +1,3 @@
-- name: Include ensure-podman
+- name: Error if used
-  include_role:
+  fail:
-    name: ensure-podman
+    msg: This role has been renamed. Please use ensure-podman instead.

roles/install-yarn/tasks/main.yaml

@@ -1,3 +1,3 @@
-- name: Include ensure-yarn.
+- name: Error if used
-  include_role:
+  fail:
-    name: ensure-yarn
+    msg: This role has been renamed. Please use ensure-yarn instead.