diff options
| author | Jhon Honce <jhonce@redhat.com> | 2015-05-01 13:57:30 -0700 |
|---|---|---|
| committer | Jhon Honce <jhonce@redhat.com> | 2015-05-29 14:36:56 -0700 |
| commit | 3e533e199aa9262f5ca45f8311e82e975cde73b9 (patch) | |
| tree | c9ce290ee05b408aa4209c9ebeaecfacb84acd12 /roles | |
| parent | 1b4526d677651cb3677cbf7cc687a76fcba47c9a (diff) | |
| download | openshift-3e533e199aa9262f5ca45f8311e82e975cde73b9.tar.gz openshift-3e533e199aa9262f5ca45f8311e82e975cde73b9.tar.bz2 openshift-3e533e199aa9262f5ca45f8311e82e975cde73b9.tar.xz openshift-3e533e199aa9262f5ca45f8311e82e975cde73b9.zip | |
* Deploy services from common playbook
Diffstat (limited to 'roles')
| -rw-r--r-- | roles/openshift_docker_registry/tasks/main.yml | 8 | ||||
| -rw-r--r-- | roles/openshift_registry/README.md (renamed from roles/openshift_docker_registry/README.md) | 0 | ||||
| -rw-r--r-- | roles/openshift_registry/handlers/main.yml (renamed from roles/openshift_docker_registry/handlers/main.yml) | 0 | ||||
| -rw-r--r-- | roles/openshift_registry/meta/main.yml (renamed from roles/openshift_docker_registry/meta/main.yml) | 0 | ||||
| -rw-r--r-- | roles/openshift_registry/tasks/main.yml | 8 | ||||
| -rw-r--r-- | roles/openshift_registry/vars/main.yml (renamed from roles/openshift_docker_registry/vars/main.yml) | 0 | ||||
| -rw-r--r-- | roles/openshift_router/tasks/main.yml | 2 |
7 files changed, 9 insertions, 9 deletions
diff --git a/roles/openshift_docker_registry/tasks/main.yml b/roles/openshift_docker_registry/tasks/main.yml deleted file mode 100644 index 18b256032..000000000 --- a/roles/openshift_docker_registry/tasks/main.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -- set_fact: _option_images="--images={{ openshift_registry_url|quote }}" - when: openshift_registry_url is defined - -- name: Deploy OpenShift Docker Registry - command: openshift admin registry --create --credentials="{{ansible_env['HOME']}}"/.config/openshift/config {{ _option_images|default() }} - register: _openshift_docker_registry__results - changed_when: "'service exists' not in _openshift_docker_registry__results.stdout" diff --git a/roles/openshift_docker_registry/README.md b/roles/openshift_registry/README.md index 202c818b8..202c818b8 100644 --- a/roles/openshift_docker_registry/README.md +++ b/roles/openshift_registry/README.md diff --git a/roles/openshift_docker_registry/handlers/main.yml b/roles/openshift_registry/handlers/main.yml index e69de29bb..e69de29bb 100644 --- a/roles/openshift_docker_registry/handlers/main.yml +++ b/roles/openshift_registry/handlers/main.yml diff --git a/roles/openshift_docker_registry/meta/main.yml b/roles/openshift_registry/meta/main.yml index 93b6797d1..93b6797d1 100644 --- a/roles/openshift_docker_registry/meta/main.yml +++ b/roles/openshift_registry/meta/main.yml diff --git a/roles/openshift_registry/tasks/main.yml b/roles/openshift_registry/tasks/main.yml new file mode 100644 index 000000000..ea362bb7d --- /dev/null +++ b/roles/openshift_registry/tasks/main.yml @@ -0,0 +1,8 @@ +--- +- set_fact: _option_images="--images={{ openshift_registry_url|quote }}" + when: openshift_registry_url is defined + +- name: Deploy OpenShift Registry + command: openshift admin registry --create --credentials=/var/lib/openshift/openshift.local.certificates/openshift-registry/.kubeconfig {{ _option_images|default() }} + register: _openshift_registry__results + changed_when: "'service exists' not in _openshift_registry__results.stdout" diff --git a/roles/openshift_docker_registry/vars/main.yml b/roles/openshift_registry/vars/main.yml index cd21505a4..cd21505a4 100644 --- a/roles/openshift_docker_registry/vars/main.yml +++ b/roles/openshift_registry/vars/main.yml diff --git a/roles/openshift_router/tasks/main.yml b/roles/openshift_router/tasks/main.yml index 56dbcc414..ae52063cb 100644 --- a/roles/openshift_router/tasks/main.yml +++ b/roles/openshift_router/tasks/main.yml @@ -3,6 +3,6 @@ when: openshift_registry_url is defined - name: Deploy OpenShift Router - command: openshift ex router --create --credentials="{{ansible_env['HOME']}}"/.config/openshift/config {{ _option_images|default() }} + command: openshift ex router --create --credentials=/var/lib/openshift/openshift.local.certificates/openshift-router/.kubeconfig {{ _option_images|default() }} register: _openshift_router__results changed_when: "'service exists' not in _openshift_router__results.stdout" |