diff options
| author | Thomas Wiest <twiest@users.noreply.github.com> | 2015-03-18 18:03:11 -0400 |
|---|---|---|
| committer | Thomas Wiest <twiest@users.noreply.github.com> | 2015-03-18 18:03:11 -0400 |
| commit | f1d5319ed661cab3ef386d94f2c639be99e14110 (patch) | |
| tree | 7bda0eee678972c507c2343984be37d31c821808 /roles/openshift_node/tasks | |
| parent | db9cf8ef4f030f30391e021f360fe0c3db1dce74 (diff) | |
| parent | 7035459d20dd2d278b0a0e6ff96421639f6e0e34 (diff) | |
| download | openshift-f1d5319ed661cab3ef386d94f2c639be99e14110.tar.gz openshift-f1d5319ed661cab3ef386d94f2c639be99e14110.tar.bz2 openshift-f1d5319ed661cab3ef386d94f2c639be99e14110.tar.xz openshift-f1d5319ed661cab3ef386d94f2c639be99e14110.zip | |
Merge pull request #116 from detiber/bugSquashing
Bug squashing
Diffstat (limited to 'roles/openshift_node/tasks')
| -rw-r--r-- | roles/openshift_node/tasks/main.yml | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/roles/openshift_node/tasks/main.yml b/roles/openshift_node/tasks/main.yml index 6721c7401..e380ba1fb 100644 --- a/roles/openshift_node/tasks/main.yml +++ b/roles/openshift_node/tasks/main.yml @@ -21,7 +21,7 @@ lineinfile: dest: /etc/sysconfig/openshift-node regexp: '^OPTIONS=' - line: "OPTIONS=\"--master=https://{{ openshift_master_ips[0] }}:8443 --loglevel={{ openshift_node_debug_level }}\"" + line: "OPTIONS=\"--master=https://{{ openshift_master_ips[0] }}:8443 --hostname={{ openshift_hostname }} --loglevel={{ openshift_node_debug_level }}\"" notify: - restart openshift-node @@ -75,4 +75,14 @@ - name: Register node (if not already registered) openshift_register_node: name: "{{ openshift_hostname }}" - resources: "{{ openshift_node_resources }}" + api_version: v1beta1 + cpu: "{{ openshift_node_resources.cpu }}" + memory: "{{ openshift_node_resources.memory }}" + pod_cidr: "{{ openshift_node_resources.cidr }}" + host_ip: "{{ ansible_default_ipv4.address }}" + labels: "{{ openshift_node_labels }}" + annotations: "{{ openshift_node_annotations }}" + # TODO: support customizing other attributes such as: client_config, + # client_cluster, client_context, client_user + # TODO: updated for v1beta3 changes after rebase: hostnames, external_ips, + # internal_ips, external_id |