73c3cd4181
While introducing the openshift-node service in 7373adc72e
, some code
was moved around and that broke the OpenShift external_deploy_task
playbook in the case of a stack update due to undefined ansible
variable.
Rename the new_masters var into new_master_nodes and introduce the
has_new_nodes boolean var that indicates there is at least one new node
in the deployment.
Related-Bug: 1794824
Change-Id: I2f386b5507836deda0816616dd7add8a0b53dfd3
147 lines
5.7 KiB
YAML
147 lines
5.7 KiB
YAML
heat_template_version: rocky
|
|
|
|
description: External tasks definition for OpenShift
|
|
|
|
parameters:
|
|
StackAction:
|
|
type: string
|
|
description: >
|
|
Heat action on performed top-level stack. Note StackUpdateType is
|
|
set to UPGRADE when a major-version upgrade is in progress.
|
|
constraints:
|
|
- allowed_values: ['CREATE', 'UPDATE']
|
|
RoleNetIpMap:
|
|
default: {}
|
|
type: json
|
|
ServiceData:
|
|
default: {}
|
|
description: Dictionary packing service data
|
|
type: json
|
|
ServiceNetMap:
|
|
default: {}
|
|
description: Mapping of service_name -> network name. Typically set
|
|
via parameter_defaults in the resource registry. This
|
|
mapping overrides those in ServiceNetMapDefaults.
|
|
type: json
|
|
DefaultPasswords:
|
|
default: {}
|
|
type: json
|
|
RoleName:
|
|
default: ''
|
|
description: Role name on which the service is applied
|
|
type: string
|
|
RoleParameters:
|
|
default: {}
|
|
description: Parameters specific to the role
|
|
type: json
|
|
EndpointMap:
|
|
default: {}
|
|
description: Mapping of service endpoint -> protocol. Typically set
|
|
via parameter_defaults in the resource registry.
|
|
type: json
|
|
OpenShiftNodeGroupName:
|
|
default: node-config-all-in-one
|
|
description: The group the nodes belong to.
|
|
type: string
|
|
tags:
|
|
- role_specific
|
|
|
|
resources:
|
|
RoleParametersValue:
|
|
type: OS::Heat::Value
|
|
properties:
|
|
type: json
|
|
value:
|
|
map_replace:
|
|
- map_replace:
|
|
- OpenShiftNodeGroupName: OpenShiftNodeGroupName
|
|
- values: {get_param: [RoleParameters]}
|
|
- values:
|
|
OpenShiftNodeGroupName: {get_param: OpenShiftNodeGroupName}
|
|
|
|
outputs:
|
|
role_data:
|
|
description: Role data for the Openshift Service
|
|
value:
|
|
service_name: openshift_node
|
|
config_settings: {}
|
|
upgrade_tasks: []
|
|
step_config: ''
|
|
external_deploy_tasks:
|
|
- name: openshift_node step 2
|
|
when: step == '2'
|
|
tags: openshift
|
|
block:
|
|
- name: set role facts for generating inventory
|
|
set_fact:
|
|
tripleo_role_name: {get_param: RoleName}
|
|
tripleo_node_group_name: {get_attr: [RoleParametersValue, value, OpenShiftNodeGroupName]}
|
|
openshift_master_network: {get_param: [ServiceNetMap, OpenshiftMasterNetwork]}
|
|
|
|
# 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
|
|
delegate_to: "{{item}}"
|
|
with_items: "{{ groups[tripleo_role_name] | default([]) }}"
|
|
failed_when: false
|
|
|
|
# NOTE(flaper87): Create all the nodes objects
|
|
# now, as yaml dicts, instead of formatting
|
|
# everything as part of a template.
|
|
# We consider new_node all the nodes that
|
|
# 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}}"
|
|
hostname: "{{item}}"
|
|
ansible_user: "{{ hostvars[item]['ansible_user'] | default(hostvars[item]['ansible_ssh_user']) | default('root') }}"
|
|
ansible_host: "{{ hostvars[item]['ansible_host'] | default(item) }}"
|
|
ansible_become: true
|
|
openshift_node_group_name: '{{tripleo_node_group_name}}'
|
|
etcd_ip: "{{hostvars[item][openshift_master_network + '_ip']}}"
|
|
openshift_ip: "{{hostvars[item][openshift_master_network + '_ip']}}"
|
|
openshift_master_bind_addr: "{{hostvars[item][openshift_master_network + '_ip']}}"
|
|
openshift_public_ip: "{{hostvars[item][openshift_master_network + '_ip']}}"
|
|
openshift_public_hostname: "{{hostvars[item][openshift_master_network + '_ip']}}"
|
|
register: all_role_nodes
|
|
with_items: "{{groups[tripleo_role_name] | default([]) }}"
|
|
|
|
- set_fact:
|
|
role_nodes: "{{all_role_nodes.results | map(attribute='ansible_facts') | map(attribute='nodes') | flatten | list}}"
|
|
new_role_nodes: "{{all_role_nodes.results | map(attribute='ansible_facts') | map(attribute='nodes') | flatten | selectattr('new_node', 'equalto', True) | list}}"
|
|
|
|
- set_fact:
|
|
has_new_nodes: "{{ (has_new_nodes | default(False)) or new_role_nodes | count > 0 }}"
|
|
|
|
- name: generate openshift inventory for {{tripleo_role_name}} role nodes
|
|
copy:
|
|
dest: "{{playbook_dir}}/openshift/inventory/{{tripleo_role_name}}_nodes.yml"
|
|
content: |
|
|
{% if role_nodes | count > 0%}
|
|
all:
|
|
hosts:
|
|
{% for host in role_nodes -%}
|
|
{{host.hostname}}:
|
|
{{host | to_nice_yaml() | indent(6)}}
|
|
{% endfor %}
|
|
|
|
children:
|
|
nodes:
|
|
hosts:
|
|
{% for host in role_nodes -%}
|
|
{{host.hostname}}:
|
|
{% endfor %}
|
|
|
|
{% if new_role_nodes | count > 0 -%}
|
|
new_nodes:
|
|
hosts:
|
|
{% for host in new_role_nodes -%}
|
|
{{host.hostname}}:
|
|
{% endfor %}
|
|
|
|
{% endif %}
|
|
|
|
{% endif %}
|