summaryrefslogtreecommitdiffstats
path: root/roles
diff options
context:
space:
mode:
authorJhon Honce <jhonce@redhat.com>2015-06-01 15:49:06 -0700
committerJhon Honce <jhonce@redhat.com>2015-06-01 15:49:06 -0700
commit28c279382f0b5d7570e10a8c56ffffbb6666ed2d (patch)
treea51cfd7350372b41b25ae2e8986ad464360ba508 /roles
parent5ecbe78c384a134620180a0a6e10a997acf4005e (diff)
downloadopenshift-28c279382f0b5d7570e10a8c56ffffbb6666ed2d.tar.gz
openshift-28c279382f0b5d7570e10a8c56ffffbb6666ed2d.tar.bz2
openshift-28c279382f0b5d7570e10a8c56ffffbb6666ed2d.tar.xz
openshift-28c279382f0b5d7570e10a8c56ffffbb6666ed2d.zip
* rename openshift_registry_url oreg_url
* rename option_images to _{oreg|ortr}_images
Diffstat (limited to 'roles')
-rw-r--r--roles/openshift_master/README.md2
-rw-r--r--roles/openshift_master/tasks/main.yml14
-rw-r--r--roles/openshift_node/README.md2
-rw-r--r--roles/openshift_register_nodes/tasks/main.yml14
-rw-r--r--roles/openshift_registry/tasks/main.yml10
-rw-r--r--roles/openshift_router/tasks/main.yml10
6 files changed, 26 insertions, 26 deletions
diff --git a/roles/openshift_master/README.md b/roles/openshift_master/README.md
index 9f9d0a613..cc5b06964 100644
--- a/roles/openshift_master/README.md
+++ b/roles/openshift_master/README.md
@@ -17,7 +17,7 @@ From this role:
|-------------------------------------|-----------------------|--------------------------------------------------|
| openshift_master_debug_level | openshift_debug_level | Verbosity of the debug logs for openshift-master |
| openshift_node_ips | [] | List of the openshift node ip addresses to pre-register when openshift-master starts up |
-| openshift_registry_url | UNDEF | Default docker registry to use |
+| oreg_url | UNDEF | Default docker registry to use |
| openshift_master_api_port | UNDEF | |
| openshift_master_console_port | UNDEF | |
| openshift_master_api_url | UNDEF | |
diff --git a/roles/openshift_master/tasks/main.yml b/roles/openshift_master/tasks/main.yml
index f9e6199a5..ac96e2b48 100644
--- a/roles/openshift_master/tasks/main.yml
+++ b/roles/openshift_master/tasks/main.yml
@@ -49,15 +49,15 @@
# TODO: should probably use a template lookup for this
# TODO: should allow for setting --etcd, --kubernetes options
# TODO: recreate config if values change
-- name: Use enterprise default for openshift_registry_url if not set
+- name: Use enterprise default for oreg_url if not set
set_fact:
- openshift_registry_url: "openshift3_beta/ose-${component}:${version}"
- when: openshift.common.deployment_type == 'enterprise' and openshift_registry_url is not defined
+ oreg_url: "openshift3_beta/ose-${component}:${version}"
+ when: openshift.common.deployment_type == 'enterprise' and oreg_url is not defined
-- name: Use online default for openshift_registry_url if not set
+- name: Use online default for oreg_url if not set
set_fact:
- openshift_registry_url: "docker-registry.ops.rhcloud.com/openshift3_beta/ose-${component}:${version}"
- when: openshift.common.deployment_type == 'online' and openshift_registry_url is not defined
+ oreg_url: "docker-registry.ops.rhcloud.com/openshift3_beta/ose-${component}:${version}"
+ when: openshift.common.deployment_type == 'online' and oreg_url is not defined
- name: Create master config
command: >
@@ -67,7 +67,7 @@
--master={{ openshift.master.api_url }}
--public-master={{ openshift.master.public_api_url }}
--listen={{ 'https' if openshift.master.api_use_ssl else 'http' }}://0.0.0.0:{{ openshift.master.api_port }}
- {{ ('--images=' ~ openshift_registry_url) if (openshift_registry_url | default('', true) != '') else '' }}
+ {{ ('--images=' ~ oreg_url) if (oreg_url | default('', true) != '') else '' }}
{{ ('--nodes=' ~ openshift_node_ips | join(',')) if (openshift_node_ips | default('', true) != '') else '' }}
args:
chdir: "{{ openshift_cert_parent_dir }}"
diff --git a/roles/openshift_node/README.md b/roles/openshift_node/README.md
index 83359f164..19d0c8db6 100644
--- a/roles/openshift_node/README.md
+++ b/roles/openshift_node/README.md
@@ -17,7 +17,7 @@ From this role:
| Name | Default value | |
|------------------------------------------|-----------------------|----------------------------------------|
| openshift_node_debug_level | openshift_debug_level | Verbosity of the debug logs for openshift-node |
-| openshift_registry_url | UNDEF (Optional) | Default docker registry to use |
+| oreg_url | UNDEF (Optional) | Default docker registry to use |
From openshift_common:
| Name | Default Value | |
diff --git a/roles/openshift_register_nodes/tasks/main.yml b/roles/openshift_register_nodes/tasks/main.yml
index d4d72d126..dcb96bbf9 100644
--- a/roles/openshift_register_nodes/tasks/main.yml
+++ b/roles/openshift_register_nodes/tasks/main.yml
@@ -6,15 +6,15 @@
# TODO: use a template lookup here
# TODO: create a failed_when condition
-- name: Use enterprise default for openshift_registry_url if not set
+- name: Use enterprise default for oreg_url if not set
set_fact:
- openshift_registry_url: "openshift3_beta/ose-${component}:${version}"
- when: openshift.common.deployment_type == 'enterprise' and openshift_registry_url is not defined
+ oreg_url: "openshift3_beta/ose-${component}:${version}"
+ when: openshift.common.deployment_type == 'enterprise' and oreg_url is not defined
-- name: Use online default for openshift_registry_url if not set
+- name: Use online default for oreg_url if not set
set_fact:
- openshift_registry_url: "docker-registry.ops.rhcloud.com/openshift3_beta/ose-${component}:${version}"
- when: openshift.common.deployment_type == 'online' and openshift_registry_url is not defined
+ oreg_url: "docker-registry.ops.rhcloud.com/openshift3_beta/ose-${component}:${version}"
+ when: openshift.common.deployment_type == 'online' and oreg_url is not defined
- name: Create node config
command: >
@@ -30,7 +30,7 @@
--certificate-authority={{ openshift_master_ca_cert }}
--signer-serial={{ openshift_master_ca_dir }}/serial.txt
--node-client-certificate-authority={{ openshift_master_ca_cert }}
- {{ ('--images=' ~ openshift_registry_url) if openshift_registry_url is defined else '' }}
+ {{ ('--images=' ~ oreg_url) if oreg_url is defined else '' }}
--listen=https://0.0.0.0:10250
args:
chdir: "{{ openshift_cert_parent_dir }}"
diff --git a/roles/openshift_registry/tasks/main.yml b/roles/openshift_registry/tasks/main.yml
index ea362bb7d..7e6982d99 100644
--- a/roles/openshift_registry/tasks/main.yml
+++ b/roles/openshift_registry/tasks/main.yml
@@ -1,8 +1,8 @@
---
-- set_fact: _option_images="--images={{ openshift_registry_url|quote }}"
- when: openshift_registry_url is defined
+- set_fact: _oreg_images="--images={{ oreg_url|quote }}"
+ when: oreg_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"
+ command: openshift admin registry --create --credentials=/var/lib/openshift/openshift.local.certificates/openshift-registry/.kubeconfig {{ _oreg_images|default() }}
+ register: _oreg_results
+ changed_when: "'service exists' not in _oreg_results.stdout"
diff --git a/roles/openshift_router/tasks/main.yml b/roles/openshift_router/tasks/main.yml
index ae52063cb..f1ee99dd3 100644
--- a/roles/openshift_router/tasks/main.yml
+++ b/roles/openshift_router/tasks/main.yml
@@ -1,8 +1,8 @@
---
-- set_fact: _option_images="--images={{ openshift_registry_url|quote }}"
- when: openshift_registry_url is defined
+- set_fact: _ortr_images="--images={{ oreg_url|quote }}"
+ when: oreg_url is defined
- name: Deploy OpenShift Router
- 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"
+ command: openshift ex router --create --credentials=/var/lib/openshift/openshift.local.certificates/openshift-router/.kubeconfig {{ _ortr_images|default() }}
+ register: _ortr_results
+ changed_when: "'service exists' not in _ortr_results.stdout"