diff options
| author | Jason DeTiberus <jdetiber@redhat.com> | 2015-03-23 16:30:49 -0400 |
|---|---|---|
| committer | Jhon Honce <jhonce@redhat.com> | 2015-03-24 11:29:44 -0700 |
| commit | d67c5b8f79609d2d3b07cc009f58e3dc988782c5 (patch) | |
| tree | 9daf6d897dbb60d680f6dd195464e5157eab6953 /roles/openshift_common | |
| parent | 461f6c1e07f36238729944a5f769600077ebf0b0 (diff) | |
| download | openshift-d67c5b8f79609d2d3b07cc009f58e3dc988782c5.tar.gz openshift-d67c5b8f79609d2d3b07cc009f58e3dc988782c5.tar.bz2 openshift-d67c5b8f79609d2d3b07cc009f58e3dc988782c5.tar.xz openshift-d67c5b8f79609d2d3b07cc009f58e3dc988782c5.zip | |
node registration changes
- Remove default value for openshift_hostname and make it required
- Remove workarounds that are no longer needed
- Remove resources parameter from openshift_register_node module
- pre-create node certificates for each node before registering node
- distribute created node certificates to each node
- Move node registration logic to a new openshift_register_nodes role
- This is because we now have to run the steps on a master as opposed to on
the nodes like we were previously doing.
- Rename openshift_register_node module to kubernetes_register_node, one more
step to genericizing enough for upstreaming, however there are still plenty
of openshift specific commands that still need to be genericized.
Diffstat (limited to 'roles/openshift_common')
| -rw-r--r-- | roles/openshift_common/README.md | 2 | ||||
| -rw-r--r-- | roles/openshift_common/defaults/main.yml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/roles/openshift_common/README.md b/roles/openshift_common/README.md index fce79047c..592a276f9 100644 --- a/roles/openshift_common/README.md +++ b/roles/openshift_common/README.md @@ -16,7 +16,7 @@ Role Variables |-------------------------------|------------------------------|----------------------------------------| | openshift_debug_level | 0 | Global openshift debug log verbosity | | openshift_hostname_workaround | True | Workaround needed to set hostname to IP address | -| openshift_hostname | openshift_public_ip if openshift_hostname_workaround else ansible_fqdn | hostname to use for this instance | +| openshift_hostname | UNDEF (Required) | hostname to use for this instance | | openshift_public_ip | UNDEF (Required) | Public IP address to use for this host | | openshift_env | default | Envrionment name if multiple OpenShift instances | diff --git a/roles/openshift_common/defaults/main.yml b/roles/openshift_common/defaults/main.yml index eb6edbc03..86351f6f6 100644 --- a/roles/openshift_common/defaults/main.yml +++ b/roles/openshift_common/defaults/main.yml @@ -4,4 +4,4 @@ openshift_debug_level: 0 # TODO: Once openshift stops resolving hostnames for node queries remove # this... openshift_hostname_workaround: true -openshift_hostname: "{{ ansible_default_ipv4.address if openshift_hostname_workaround else ansible_fqdn }}" + |