Created
June 7, 2017 13:15
-
-
Save eriknelson/a1e1dd911c901b58d601398ab55f437a to your computer and use it in GitHub Desktop.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/ansible/roles/ansible_service_broker_setup/tasks/main.yml b/ansible/roles/ansible_service_broker_setup/tasks/main.yml | |
index 0a4c124..959449e 100644 | |
--- a/ansible/roles/ansible_service_broker_setup/tasks/main.yml | |
+++ b/ansible/roles/ansible_service_broker_setup/tasks/main.yml | |
@@ -1,63 +1,63 @@ | |
--- | |
- - name: Docker pull {{ broker_image }} | |
- docker_image: | |
- name: "{{ broker_image }}" | |
+ #- name: Docker pull {{ broker_image }} | |
+ #docker_image: | |
+ #name: "{{ broker_image }}" | |
- - name: Docker pull {{ etcd_image }} | |
- docker_image: | |
- name: "{{ etcd_image }}" | |
+ #- name: Docker pull {{ etcd_image }} | |
+ #docker_image: | |
+ #name: "{{ etcd_image }}" | |
- - name: Curling ansible-service-broker-all.yaml | |
- get_url: | |
- url: https://raw.githubusercontent.com/openshift/ansible-service-broker/master/ansible-service-broker-all.yaml | |
- dest: /tmp/deploy-ansible-service-broker-all.yaml.j2 | |
+ #- name: Curling ansible-service-broker-all.yaml | |
+ #get_url: | |
+ #url: https://raw.githubusercontent.com/openshift/ansible-service-broker/master/ansible-service-broker-all.yaml | |
+ #dest: /tmp/deploy-ansible-service-broker-all.yaml.j2 | |
- - name: Setting facts for rendering ansible-service-broker-all.yaml template | |
- set_fact: | |
- dockerhub_pass: "{{ dockerhub_user_password }}" | |
- dockerhub_user: "{{ dockerhub_user_name }}" | |
- dockerhub_org: "{{ dockerhub_org_name }}" | |
- openshift_pass: "{{ cluster_user_password }}" | |
- openshift_user: "{{ cluster_user }}" | |
- openshift_target: "{{ openshift_url }}" | |
+ #- name: Setting facts for rendering ansible-service-broker-all.yaml template | |
+ #set_fact: | |
+ #dockerhub_pass: "{{ dockerhub_user_password }}" | |
+ #dockerhub_user: "{{ dockerhub_user_name }}" | |
+ #dockerhub_org: "{{ dockerhub_org_name }}" | |
+ #openshift_pass: "{{ cluster_user_password }}" | |
+ #openshift_user: "{{ cluster_user }}" | |
+ #openshift_target: "{{ openshift_url }}" | |
- - name: Rendering deploy-ansible-service-broker-all.yaml | |
- template: | |
- src: /tmp/deploy-ansible-service-broker-all.yaml.j2 | |
- dest: /tmp/deploy-ansible-service-broker-all.yaml | |
- owner: "{{ ansible_env.USER }}" | |
- mode: 0644 | |
+ #- name: Rendering deploy-ansible-service-broker-all.yaml | |
+ #template: | |
+ #src: /tmp/deploy-ansible-service-broker-all.yaml.j2 | |
+ #dest: /tmp/deploy-ansible-service-broker-all.yaml | |
+ #owner: "{{ ansible_env.USER }}" | |
+ #mode: 0644 | |
- - name: Create ansible-service-broker-all | |
- shell: "{{ oc_cmd }} create -f /tmp/deploy-ansible-service-broker-all.yaml" | |
+ #- name: Create ansible-service-broker-all | |
+ #shell: "{{ oc_cmd }} create -f /tmp/deploy-ansible-service-broker-all.yaml" | |
- - name: Switch project to ansible-service-broker | |
- shell: "{{ oc_cmd }} project ansible-service-broker" | |
+ #- name: Switch project to ansible-service-broker | |
+ #shell: "{{ oc_cmd }} project ansible-service-broker" | |
- - name: Waiting 10 minutes for ASB pod | |
- action: | |
- shell "{{ oc_cmd }}" get pods | grep -iEm1 "asb.*?running" | grep -v deploy | |
- register: wait_for_asb_pod | |
- until: wait_for_asb_pod.rc == 0 | |
- retries: 60 | |
- delay: 10 | |
+ #- name: Waiting 10 minutes for ASB pod | |
+ #action: | |
+ #shell "{{ oc_cmd }}" get pods | grep -iEm1 "asb.*?running" | grep -v deploy | |
+ #register: wait_for_asb_pod | |
+ #until: wait_for_asb_pod.rc == 0 | |
+ #retries: 60 | |
+ #delay: 10 | |
- - name: Waiting 10 minutes for ASB etcd pod | |
- action: | |
- shell "{{ oc_cmd }}" get pods | grep -iEm1 "etcd.*?running" | grep -v deploy | |
- register: wait_for_asb_etcd_pod | |
- until: wait_for_asb_etcd_pod.rc == 0 | |
- retries: 60 | |
- delay: 10 | |
+ #- name: Waiting 10 minutes for ASB etcd pod | |
+ #action: | |
+ #shell "{{ oc_cmd }}" get pods | grep -iEm1 "etcd.*?running" | grep -v deploy | |
+ #register: wait_for_asb_etcd_pod | |
+ #until: wait_for_asb_etcd_pod.rc == 0 | |
+ #retries: 60 | |
+ #delay: 10 | |
- - name: Get route for ansible-service-broker | |
- shell: "'{{ oc_cmd }}' get routes | grep ansible-service-broker | awk '{print $2}'" | |
- register: result_get_route_asb | |
- retries: 6 | |
- delay: 10 | |
+ #- name: Get route for ansible-service-broker | |
+ #shell: "'{{ oc_cmd }}' get routes | grep ansible-service-broker | awk '{print $2}'" | |
+ #register: result_get_route_asb | |
+ #retries: 6 | |
+ #delay: 10 | |
- set_fact: | |
- ansible_service_broker_route: "{{ result_get_route_asb.stdout }}" | |
+ ansible_service_broker_route: "172.17.0.1:1338" | |
- name: Trigger ASB bootstrap to load APBs | |
uri: | |
diff --git a/ansible/setup_local_environment.yml b/ansible/setup_local_environment.yml | |
index a619f98..bd87c61 100644 | |
--- a/ansible/setup_local_environment.yml | |
+++ b/ansible/setup_local_environment.yml | |
@@ -13,7 +13,7 @@ | |
roles: | |
- openshift_setup | |
- service_catalog_setup | |
- - ansible_service_broker_setup | |
+ #- ansible_service_broker_setup | |
- env_hacks | |
post_tasks: | |
- set_fact: |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment