summaryrefslogtreecommitdiffstats
path: root/roles
diff options
context:
space:
mode:
authorAndrew Butcher <abutcher@redhat.com>2017-10-20 15:44:11 -0400
committerTim Bielawa <tbielawa@redhat.com>2017-10-20 16:05:52 -0400
commit6c3a0373e1a48f730e9a279a255c0f1a58613cc7 (patch)
treeeb93335f9d4025a09f390b0d9574ebe4dc4b7fdc /roles
parent7d88f8dada9f19dd6b49af9bb539e43aaa15f138 (diff)
downloadopenshift-6c3a0373e1a48f730e9a279a255c0f1a58613cc7.tar.gz
openshift-6c3a0373e1a48f730e9a279a255c0f1a58613cc7.tar.bz2
openshift-6c3a0373e1a48f730e9a279a255c0f1a58613cc7.tar.xz
openshift-6c3a0373e1a48f730e9a279a255c0f1a58613cc7.zip
Move add_many_container_providers.yml to playbooks/byo/openshift-management with a noop task include to load filter plugins.
Diffstat (limited to 'roles')
-rw-r--r--roles/openshift_management/README.md2
-rw-r--r--roles/openshift_management/tasks/add_many_container_providers.yml41
-rw-r--r--roles/openshift_management/tasks/noop.yml1
3 files changed, 2 insertions, 42 deletions
diff --git a/roles/openshift_management/README.md b/roles/openshift_management/README.md
index 817ad4daa..05ca27913 100644
--- a/roles/openshift_management/README.md
+++ b/roles/openshift_management/README.md
@@ -549,7 +549,7 @@ the config file path.
```
$ ansible-playbook -v -e container_providers_config=/tmp/cp.yml \
- roles/openshift_management/tasks/add_many_container_providers.yml
+ playbooks/byo/openshift-management/add_many_container_providers.yml
```
Afterwards you will find two new container providers in your
diff --git a/roles/openshift_management/tasks/add_many_container_providers.yml b/roles/openshift_management/tasks/add_many_container_providers.yml
deleted file mode 100644
index 10a1f4c83..000000000
--- a/roles/openshift_management/tasks/add_many_container_providers.yml
+++ /dev/null
@@ -1,41 +0,0 @@
----
-- hosts: localhost
- tasks:
- - name: Ensure the container provider configuration is defined
- assert:
- that: container_providers_config is defined
- msg: |
- Error: Must provide providers config path. Fix: Add '-e container_providers_config=/path/to/your/config' to the ansible-playbook command
-
- - name: Include providers/management configuration
- include_vars:
- file: "{{ container_providers_config }}"
-
- - name: Ensure this cluster is a container provider
- uri:
- url: "https://{{ management_server['hostname'] }}/api/providers"
- body_format: json
- method: POST
- user: "{{ management_server['user'] }}"
- password: "{{ management_server['password'] }}"
- validate_certs: no
- # Docs on formatting the BODY of the POST request:
- # http://manageiq.org/docs/reference/latest/api/reference/providers.html#specifying-connection-configurations
- body: "{{ item }}"
- failed_when: false
- with_items: "{{ container_providers }}"
- register: results
-
- # TODO: Make this prettier and easier to read
- - name: Save results
- copy:
- dest: /tmp/results.json
- content: "{{ results.results | to_nice_json }}"
- # state: present
- # debug:
- # var: item.item
- # with_items: "{{ results.results }}"
-
- - name: print each result
- debug:
- msg: "{{ results.results | oo_filter_container_providers }}"
diff --git a/roles/openshift_management/tasks/noop.yml b/roles/openshift_management/tasks/noop.yml
new file mode 100644
index 000000000..ed97d539c
--- /dev/null
+++ b/roles/openshift_management/tasks/noop.yml
@@ -0,0 +1 @@
+---