openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "Parametrize OpenShift deployment type"

Browse Source
This commit is contained in:
Zuul 2018-10-29 22:47:14 +00:00 committed by Gerrit Code Review
commit 53179d929c
2 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
extraconfig/services/openshift-master.yaml
View File

@ -169,7 +169,7 @@ outputs:
data:
image: {get_param: DockerOpenShiftBaseImage}
openshift_enable_excluders: false
openshift_deployment_type: origin
openshift_deployment_type: "{{tripleo_openshift_deployment_type}}"
openshift_use_dnsmasq: true
openshift_use_external_openvswitch: true
openshift_docker_selinux_enabled: false
@ -206,16 +206,16 @@ outputs:
# NOTE(flaper87): Check if origin-node is running in the openshift
# nodes so we can flag the node as new later on.
- name: Check if origin-node is running
command: systemctl is-active --quiet origin-node
register: origin_nodes
- name: Check if node service is running
command: "systemctl is-active --quiet {{tripleo_openshift_service_type}}-node"
register: node_services
delegate_to: "{{item}}"
with_items: "{{ groups[tripleo_role_name] | default([]) }}"
failed_when: false
- set_fact:
nodes:
- new_node: "{{origin_nodes.results | selectattr('item', 'equalto', item) | selectattr('rc', 'greaterthan', 0) | list | count > 0}}"
- new_node: "{{node_services.results | selectattr('item', 'equalto', item) | selectattr('rc', 'greaterthan', 0) | list | count > 0}}"
hostname: "{{item}}"
register: all_master_nodes
with_items: "{{groups[tripleo_role_name] | default([]) }}"

23
extraconfig/services/openshift-node.yaml
View File

@ -45,6 +45,12 @@ parameters:
type: string
tags:
- role_specific
OpenShiftDeploymentType:
default: 'origin'
description: The OpenShift-Ansible deployment type.
type: string
constraints:
- allowed_values: ['origin', 'openshift-enterprise']
resources:
RoleParametersValue:
@ -77,12 +83,21 @@ outputs:
tripleo_role_name: {get_param: RoleName}
tripleo_node_group_name: {get_attr: [RoleParametersValue, value, OpenShiftNodeGroupName]}
openshift_master_network: {get_param: [ServiceNetMap, OpenshiftMasterNetwork]}
tripleo_openshift_deployment_type: {get_param: OpenShiftDeploymentType}
- set_fact:
tripleo_openshift_service_type: >-
{%- if tripleo_openshift_deployment_type == 'origin' -%}
origin
{%- else -%}
atomic-openshift
{%- endif -%}
# NOTE(flaper87): Check if origin-node is running in the openshift
# nodes so we can flag the node as new later on.
- name: Check if origin-node is running
command: systemctl is-active --quiet origin-node
register: origin_nodes
- name: Check if node service is running
command: "systemctl is-active --quiet {{tripleo_openshift_service_type}}-node"
register: node_services
delegate_to: "{{item}}"
with_items: "{{ groups[tripleo_role_name] | default([]) }}"
failed_when: false
@ -94,7 +109,7 @@ outputs:
# exited with 1 in the previous task.
- set_fact:
nodes:
- new_node: "{{origin_nodes.results | selectattr('item', 'equalto', item) | selectattr('stdout', 'greaterthan', 0) | list | count > 0}}"
- new_node: "{{node_services.results | selectattr('item', 'equalto', item) | selectattr('stdout', 'greaterthan', 0) | list | count > 0}}"
hostname: "{{item}}"
ansible_user: "{{ hostvars[item]['ansible_user'] | default(hostvars[item]['ansible_ssh_user']) | default('root') }}"
ansible_host: "{{ hostvars[item]['ansible_host'] | default(item) }}"