summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason DeTiberus <detiber@gmail.com>2015-06-10 14:52:40 -0400
committerJason DeTiberus <detiber@gmail.com>2015-06-10 14:52:40 -0400
commit34278f136fb3471ecaa59f42033f00f76c390647 (patch)
tree849259dec5cd9cd9a5dfbbbb530f5ed720c14cb5
parent04f49c188537a98c546b3e0620010b45c539f1e2 (diff)
parent8d06801770850fd46bf400593d5e47a1fa36b23e (diff)
downloadopenshift-34278f136fb3471ecaa59f42033f00f76c390647.tar.gz
openshift-34278f136fb3471ecaa59f42033f00f76c390647.tar.bz2
openshift-34278f136fb3471ecaa59f42033f00f76c390647.tar.xz
openshift-34278f136fb3471ecaa59f42033f00f76c390647.zip
Merge pull request #41 from jwhonce/wip/bugs
Refactor to use openshift_master_config_dir when deploying services
-rw-r--r--roles/openshift_registry/tasks/main.yml5
-rw-r--r--roles/openshift_registry/vars/main.yml1
-rw-r--r--roles/openshift_router/tasks/main.yml5
-rw-r--r--roles/openshift_router/vars/main.yml1
4 files changed, 10 insertions, 2 deletions
diff --git a/roles/openshift_registry/tasks/main.yml b/roles/openshift_registry/tasks/main.yml
index 7e6982d99..29387d7d5 100644
--- a/roles/openshift_registry/tasks/main.yml
+++ b/roles/openshift_registry/tasks/main.yml
@@ -3,6 +3,9 @@
when: oreg_url is defined
- name: Deploy OpenShift Registry
- command: openshift admin registry --create --credentials=/var/lib/openshift/openshift.local.certificates/openshift-registry/.kubeconfig {{ _oreg_images|default() }}
+ command: >
+ {{ openshift.common.admin_binary }} registry
+ --create
+ --credentials={{ openshift_master_config_dir }}/openshift-registry.kubeconfig {{ _oreg_images|default() }}
register: _oreg_results
changed_when: "'service exists' not in _oreg_results.stdout"
diff --git a/roles/openshift_registry/vars/main.yml b/roles/openshift_registry/vars/main.yml
index cd21505a4..9fb501e85 100644
--- a/roles/openshift_registry/vars/main.yml
+++ b/roles/openshift_registry/vars/main.yml
@@ -1,2 +1,3 @@
---
+openshift_master_config_dir: /etc/openshift/master
diff --git a/roles/openshift_router/tasks/main.yml b/roles/openshift_router/tasks/main.yml
index f1ee99dd3..929177262 100644
--- a/roles/openshift_router/tasks/main.yml
+++ b/roles/openshift_router/tasks/main.yml
@@ -3,6 +3,9 @@
when: oreg_url is defined
- name: Deploy OpenShift Router
- command: openshift ex router --create --credentials=/var/lib/openshift/openshift.local.certificates/openshift-router/.kubeconfig {{ _ortr_images|default() }}
+ command: >
+ {{ openshift.common.admin_binary }} router
+ --create
+ --credentials={{ openshift_master_config_dir }}/openshift-router.kubeconfig {{ _ortr_images|default() }}
register: _ortr_results
changed_when: "'service exists' not in _ortr_results.stdout"
diff --git a/roles/openshift_router/vars/main.yml b/roles/openshift_router/vars/main.yml
index cd21505a4..9fb501e85 100644
--- a/roles/openshift_router/vars/main.yml
+++ b/roles/openshift_router/vars/main.yml
@@ -1,2 +1,3 @@
---
+openshift_master_config_dir: /etc/openshift/master