diff options
| author | Russell Teague <rteague@redhat.com> | 2017-11-27 16:22:16 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-27 16:22:16 -0500 |
| commit | c5de3391772fa41f0af79f7d40ced016454d86ea (patch) | |
| tree | d7aff1972019a7b756d48dc922b33a5f60e06a66 /roles | |
| parent | e7e699a4201754fe9ccd1b9adffad5be5fff18b3 (diff) | |
| parent | d64c920b751b99559729a88008c908053c40f68a (diff) | |
| download | openshift-c5de3391772fa41f0af79f7d40ced016454d86ea.tar.gz openshift-c5de3391772fa41f0af79f7d40ced016454d86ea.tar.bz2 openshift-c5de3391772fa41f0af79f7d40ced016454d86ea.tar.xz openshift-c5de3391772fa41f0af79f7d40ced016454d86ea.zip | |
Merge pull request #6240 from mtnbikenc/include-deprecation-openshift-service-catalog
Include Deprecation - openshift-service-catalog
Diffstat (limited to 'roles')
| -rw-r--r-- | roles/ansible_service_broker/tasks/install.yml | 4 | ||||
| -rw-r--r-- | roles/ansible_service_broker/tasks/main.yml | 4 | ||||
| -rw-r--r-- | roles/openshift_service_catalog/tasks/install.yml | 4 | ||||
| -rw-r--r-- | roles/openshift_service_catalog/tasks/main.yml | 4 | ||||
| -rw-r--r-- | roles/template_service_broker/tasks/main.yml | 4 |
5 files changed, 10 insertions, 10 deletions
diff --git a/roles/ansible_service_broker/tasks/install.yml b/roles/ansible_service_broker/tasks/install.yml index ff90f59a3..c90bbbe9b 100644 --- a/roles/ansible_service_broker/tasks/install.yml +++ b/roles/ansible_service_broker/tasks/install.yml @@ -30,9 +30,9 @@ ansible_service_broker_image: "{{ ansible_service_broker_image_prefix }}ansible-service-broker:{{ ansible_service_broker_image_tag }}" ansible_service_broker_etcd_image: "{{ ansible_service_broker_etcd_image_prefix }}etcd:{{ ansible_service_broker_etcd_image_tag }}" -- include: validate_facts.yml +- include_tasks: validate_facts.yml -- include: generate_certs.yml +- include_tasks: generate_certs.yml # Deployment of ansible-service-broker starts here - name: create openshift-ansible-service-broker project diff --git a/roles/ansible_service_broker/tasks/main.yml b/roles/ansible_service_broker/tasks/main.yml index f5e06d163..4a3c15d01 100644 --- a/roles/ansible_service_broker/tasks/main.yml +++ b/roles/ansible_service_broker/tasks/main.yml @@ -1,8 +1,8 @@ --- # do any asserts here -- include: install.yml +- include_tasks: install.yml when: ansible_service_broker_install | bool -- include: remove.yml +- include_tasks: remove.yml when: ansible_service_broker_remove | bool diff --git a/roles/openshift_service_catalog/tasks/install.yml b/roles/openshift_service_catalog/tasks/install.yml index 3507330e3..41a6691c9 100644 --- a/roles/openshift_service_catalog/tasks/install.yml +++ b/roles/openshift_service_catalog/tasks/install.yml @@ -40,7 +40,7 @@ command: > {{ openshift.common.client_binary }} --config=/etc/origin/master/admin.kubeconfig adm pod-network make-projects-global kube-service-catalog -- include: generate_certs.yml +- include_tasks: generate_certs.yml - copy: src: kubeservicecatalog_roles_bindings.yml @@ -252,7 +252,7 @@ session_affinity: None service_type: ClusterIP -- include: start_api_server.yml +- include_tasks: start_api_server.yml - name: Delete temp directory file: diff --git a/roles/openshift_service_catalog/tasks/main.yml b/roles/openshift_service_catalog/tasks/main.yml index dc0d6a370..ffdbe2b11 100644 --- a/roles/openshift_service_catalog/tasks/main.yml +++ b/roles/openshift_service_catalog/tasks/main.yml @@ -1,8 +1,8 @@ --- # do any asserts here -- include: install.yml +- include_tasks: install.yml when: not openshift_service_catalog_remove | default(false) | bool -- include: remove.yml +- include_tasks: remove.yml when: openshift_service_catalog_remove | default(false) | bool diff --git a/roles/template_service_broker/tasks/main.yml b/roles/template_service_broker/tasks/main.yml index 6a4d89a46..71c8ca470 100644 --- a/roles/template_service_broker/tasks/main.yml +++ b/roles/template_service_broker/tasks/main.yml @@ -1,8 +1,8 @@ --- # do any asserts here -- include: install.yml +- include_tasks: install.yml when: template_service_broker_install | bool -- include: remove.yml +- include_tasks: remove.yml when: template_service_broker_remove | bool |