diff options
| author | Wesley Hearn <wesley.s.hearn@gmail.com> | 2015-07-23 11:33:55 -0400 |
|---|---|---|
| committer | Wesley Hearn <wesley.s.hearn@gmail.com> | 2015-07-23 11:33:55 -0400 |
| commit | 97f96b71ff8abc2ccf38e745e124c68b91a71146 (patch) | |
| tree | 5277b77d4652b3c502f7f5f9da4033ae89edd24f /playbooks/common | |
| parent | 65aa983ce83cafc45d28a1a283525f1fa45a9895 (diff) | |
| parent | c4cca1d7184ae859706b5854a04f18095c12f1d6 (diff) | |
| download | openshift-97f96b71ff8abc2ccf38e745e124c68b91a71146.tar.gz openshift-97f96b71ff8abc2ccf38e745e124c68b91a71146.tar.bz2 openshift-97f96b71ff8abc2ccf38e745e124c68b91a71146.tar.xz openshift-97f96b71ff8abc2ccf38e745e124c68b91a71146.zip | |
Merge pull request #376 from wshearn/infra_node_support
Infra node support
Diffstat (limited to 'playbooks/common')
| -rw-r--r-- | playbooks/common/openshift-cluster/set_node_launch_facts_tasks.yml | 8 | ||||
| -rw-r--r-- | playbooks/common/openshift-node/config.yml | 10 |
2 files changed, 9 insertions, 9 deletions
diff --git a/playbooks/common/openshift-cluster/set_node_launch_facts_tasks.yml b/playbooks/common/openshift-cluster/set_node_launch_facts_tasks.yml index 96e1a9a63..278942f8b 100644 --- a/playbooks/common/openshift-cluster/set_node_launch_facts_tasks.yml +++ b/playbooks/common/openshift-cluster/set_node_launch_facts_tasks.yml @@ -1,11 +1,13 @@ --- -- set_fact: k8s_type="node" +- set_fact: k8s_type=node +- set_fact: sub_host_type="{{ type }}" +- set_fact: number_nodes="{{ count }}" - name: Generate node instance names(s) set_fact: - scratch_name: "{{ cluster_id }}-{{ k8s_type }}-{{ '%05x' | format(1048576 | random) }}" + scratch_name: "{{ cluster_id }}-{{ k8s_type }}-{{ sub_host_type }}-{{ '%05x' | format(1048576 | random) }}" register: node_names_output - with_sequence: count={{ num_nodes }} + with_sequence: count={{ number_nodes }} - set_fact: node_names: "{{ node_names_output.results | default([]) diff --git a/playbooks/common/openshift-node/config.yml b/playbooks/common/openshift-node/config.yml index bd35008b8..6ef375bbb 100644 --- a/playbooks/common/openshift-node/config.yml +++ b/playbooks/common/openshift-node/config.yml @@ -129,16 +129,14 @@ openshift_nodes: "{{ hostvars | oo_select_keys(groups['oo_nodes_to_config']) | oo_collect('openshift.common.hostname') }}" - openshift_unscheduleable_nodes: "{{ hostvars - | oo_select_keys(groups['oo_nodes_to_config'] - | default([])) - | oo_collect('openshift.common.hostname', {'openshift_scheduleable': False}) }}" + openshift_unscheduleable_nodes: "{{ hostvars | oo_select_keys(groups['oo_nodes_to_config'] | default([])) + | oo_collect('openshift.common.hostname', {'openshift_scheduleable': False}) }}" pre_tasks: - set_fact: openshift_scheduleable_nodes: "{{ hostvars - | oo_select_keys(groups['oo_nodes_to_config'] - | default([])) + | oo_select_keys(groups['oo_nodes_to_config'] | default([])) | oo_collect('openshift.common.hostname') | difference(openshift_unscheduleable_nodes) }}" + roles: - openshift_manage_node |