diff options
| author | Eric Wolinetz <ewolinet@redhat.com> | 2017-06-23 09:40:36 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-23 09:40:36 -0500 |
| commit | 68ce47d836ece0f57082c2ce3fdf32d79a436772 (patch) | |
| tree | bfe81246dfe0fee75d2be679404640acfbd59bd6 /roles/ansible_service_broker | |
| parent | 7c1d735ff983b9d494cdbdb4c113b1282bab6242 (diff) | |
| parent | e59ab987dc732d2512ea0dd681deeb52fb80b169 (diff) | |
| download | openshift-68ce47d836ece0f57082c2ce3fdf32d79a436772.tar.gz openshift-68ce47d836ece0f57082c2ce3fdf32d79a436772.tar.bz2 openshift-68ce47d836ece0f57082c2ce3fdf32d79a436772.tar.xz openshift-68ce47d836ece0f57082c2ce3fdf32d79a436772.zip | |
Merge pull request #28 from fabianvf/style-fixes
fix yamllint issues, remove service_catalog_broker
Diffstat (limited to 'roles/ansible_service_broker')
| -rw-r--r-- | roles/ansible_service_broker/tasks/install.yml | 34 | ||||
| -rw-r--r-- | roles/ansible_service_broker/tasks/validate_facts.yml | 13 |
2 files changed, 24 insertions, 23 deletions
diff --git a/roles/ansible_service_broker/tasks/install.yml b/roles/ansible_service_broker/tasks/install.yml index f626b100a..e383c94da 100644 --- a/roles/ansible_service_broker/tasks/install.yml +++ b/roles/ansible_service_broker/tasks/install.yml @@ -149,18 +149,18 @@ - "--listen-client-urls=http://0.0.0.0:2379" - "--advertise-client-urls=http://0.0.0.0:2379" ports: - - containerPort: 2379 - protocol: TCP + - containerPort: 2379 + protocol: TCP env: - - name: ETCDCTL_API - value: "3" + - name: ETCDCTL_API + value: "3" volumeMounts: - - mountPath: /data - name: etcd + - mountPath: /data + name: etcd volumes: - - name: etcd - persistentVolumeClaim: - claimName: etcd + - name: etcd + persistentVolumeClaim: + claimName: etcd - name: create ansible-service-broker deployment oc_obj: @@ -202,16 +202,16 @@ - containerPort: 1338 protocol: TCP env: - - name: BROKER_CONFIG - value: /etc/ansible-service-broker/config.yaml + - name: BROKER_CONFIG + value: /etc/ansible-service-broker/config.yaml terminationMessagePath: /tmp/termination-log volumes: - - name: config-volume - configMap: - name: broker-config - items: - - key: broker-config - path: config.yaml + - name: config-volume + configMap: + name: broker-config + items: + - key: broker-config + path: config.yaml # TODO: saw a oc_configmap in the library, but didn't understand how to get it to do the following: diff --git a/roles/ansible_service_broker/tasks/validate_facts.yml b/roles/ansible_service_broker/tasks/validate_facts.yml index 053fdc09d..604d24e1d 100644 --- a/roles/ansible_service_broker/tasks/validate_facts.yml +++ b/roles/ansible_service_broker/tasks/validate_facts.yml @@ -1,14 +1,15 @@ +--- - name: validate Dockerhub registry settings fail: msg="To use the dockerhub registry, you must provide the ansible_service_broker_registry_user. ansible_service_broker_registry_password, and ansible_service_broker_registry_organization parameters" when: - - ansible_service_broker_registry_type == 'dockerhub' - - not (ansible_service_broker_registry_user and - ansible_service_broker_registry_password and - ansible_service_broker_registry_organization) + - ansible_service_broker_registry_type == 'dockerhub' + - not (ansible_service_broker_registry_user and + ansible_service_broker_registry_password and + ansible_service_broker_registry_organization) - name: validate RHCC registry settings fail: msg="To use the Red Hat Container Catalog registry, you must provide the ansible_service_broker_registry_url" when: - - ansible_service_broker_registry_type == 'rhcc' - - not ansible_service_broker_registry_url + - ansible_service_broker_registry_type == 'rhcc' + - not ansible_service_broker_registry_url |