summaryrefslogtreecommitdiffstats
path: root/playbooks
diff options
context:
space:
mode:
authorDevan Goodwin <dgoodwin@redhat.com>2016-05-25 09:20:15 -0300
committerDevan Goodwin <dgoodwin@redhat.com>2016-05-25 10:29:18 -0300
commit717012aa4d5df01e5859ce44705abfbf34be8047 (patch)
tree19bb9ebbd4b0045bac07fdd60cf37a99693bf1bf /playbooks
parent5c833d9f29e292d11c0cbf08786e9015f133ce17 (diff)
downloadopenshift-717012aa4d5df01e5859ce44705abfbf34be8047.tar.gz
openshift-717012aa4d5df01e5859ce44705abfbf34be8047.tar.bz2
openshift-717012aa4d5df01e5859ce44705abfbf34be8047.tar.xz
openshift-717012aa4d5df01e5859ce44705abfbf34be8047.zip
Hookup node configuration.
Diffstat (limited to 'playbooks')
-rw-r--r--playbooks/common/openshift-master/config.yml9
-rw-r--r--playbooks/common/openshift-node/config.yml8
2 files changed, 10 insertions, 7 deletions
diff --git a/playbooks/common/openshift-master/config.yml b/playbooks/common/openshift-master/config.yml
index 9842e3917..fb35a9d2f 100644
--- a/playbooks/common/openshift-master/config.yml
+++ b/playbooks/common/openshift-master/config.yml
@@ -175,8 +175,8 @@
when: openshift.common.is_containerized | bool and openshift_image_tag is defined
- name: Determine version to configure if already installed
set_fact:
- openshift_version: "{{ openshift.common.version_requested }}"
- when: openshift.common.is_containerized | bool and openshift.common.version_requested is defined
+ openshift_version: "{{ openshift.common.version }}"
+ when: openshift.common.is_containerized | bool and openshift.common.version is defined
- debug: var=openshift_version
- name: Determine if master certificates need to be generated
@@ -366,6 +366,7 @@
serial: 1
vars:
sync_tmpdir: "{{ hostvars.localhost.g_master_mktemp.stdout }}"
+ openshift_version: "{{ g_openshift_version_requested }}"
openshift_master_ha: "{{ openshift.master.ha }}"
openshift_master_count: "{{ openshift.master.master_count }}"
openshift_master_session_auth_secrets: "{{ hostvars[groups.oo_first_master.0].openshift.master.session_auth_secrets }}"
@@ -376,7 +377,6 @@
| union(groups['oo_etcd_to_config'] | default([])))
| oo_collect('openshift.common.hostname') | default([]) | join (',')
}}"
- openshift_version: "{{ g_openshift_version_requested }}"
when: "{{ (openshift_http_proxy is defined or openshift_https_proxy is defined) and
openshift_generate_no_proxy_hosts | default(True) | bool }}"
pre_tasks:
@@ -400,7 +400,6 @@
- name: Create group for deployment type
group_by: key=oo_masters_deployment_type_{{ openshift.common.deployment_type }}
changed_when: False
- - fail:
# TODO: This is a copy paste of the oo_first_master, how do we reconcile the code but change openshift_version?
- name: Configure remaining master instances
@@ -409,6 +408,7 @@
serial: 1
vars:
sync_tmpdir: "{{ hostvars.localhost.g_master_mktemp.stdout }}"
+ openshift_version: "{{ oo_first_master.openshift.common.version.split('-')[0] }}"
openshift_master_ha: "{{ openshift.master.ha }}"
openshift_master_count: "{{ openshift.master.master_count }}"
openshift_master_session_auth_secrets: "{{ hostvars[groups.oo_first_master.0].openshift.master.session_auth_secrets }}"
@@ -419,7 +419,6 @@
| union(groups['oo_etcd_to_config'] | default([])))
| oo_collect('openshift.common.hostname') | default([]) | join (',')
}}"
- openshift_version: "{{ g_openshift_version_requested }}"
when: "{{ (openshift_http_proxy is defined or openshift_https_proxy is defined) and
openshift_generate_no_proxy_hosts | default(True) | bool }}"
pre_tasks:
diff --git a/playbooks/common/openshift-node/config.yml b/playbooks/common/openshift-node/config.yml
index b3491ef8d..9809ee629 100644
--- a/playbooks/common/openshift-node/config.yml
+++ b/playbooks/common/openshift-node/config.yml
@@ -113,6 +113,7 @@
hosts: oo_containerized_master_nodes
serial: 1
vars:
+ openshift_version: "{{ hostvars[groups.oo_first_master.0].openshift.common.version }}"
openshift_node_master_api_url: "{{ hostvars[groups.oo_first_master.0].openshift.master.api_url }}"
openshift_node_first_master_ip: "{{ hostvars[groups.oo_first_master.0].openshift.common.ip }}"
openshift_docker_hosted_registry_network: "{{ hostvars[groups.oo_first_master.0].openshift.common.portal_net }}"
@@ -121,14 +122,17 @@
| union(groups['oo_etcd_to_config'] | default([])))
| oo_collect('openshift.common.hostname') | default([]) | join (',')
}}"
- when: "{{ (openshift_http_proxy is defined or openshift_https_proxy is defined) and
+ when: "{{ (openshift_http_proxy is defined or openshift_https_proxy is defined) and
openshift_generate_no_proxy_hosts | default(True) | bool }}"
+ pre_tasks:
+ - debug: var=hostvars[groups.oo_first_master.0].openshift.common.version
roles:
- openshift_node
- name: Configure node instances
hosts: oo_nodes_to_config:!oo_containerized_master_nodes
vars:
+ openshift_version: "{{ hostvars[groups.oo_first_master.0].openshift.common.version }}"
openshift_node_master_api_url: "{{ hostvars[groups.oo_first_master.0].openshift.master.api_url }}"
openshift_node_first_master_ip: "{{ hostvars[groups.oo_first_master.0].openshift.common.ip }}"
openshift_docker_hosted_registry_network: "{{ hostvars[groups.oo_first_master.0].openshift.common.portal_net }}"
@@ -137,7 +141,7 @@
| union(groups['oo_etcd_to_config'] | default([])))
| oo_collect('openshift.common.hostname') | default([]) | join (',')
}}"
- when: "{{ (openshift_http_proxy is defined or openshift_https_proxy is defined) and
+ when: "{{ (openshift_http_proxy is defined or openshift_https_proxy is defined) and
openshift_generate_no_proxy_hosts | default(True) | bool }}"
roles:
- openshift_node