OpenShift: Accept generic global parameters
This will allow arbitrary config of global variables for openshift-ansible, e.g. customizing SDN params according to: https://docs.openshift.org/3.6/install_config/configuring_sdn.html Also remove the setting which was meant to disable OVS service handlers in openshift-ansible -- that wouldn't solve the problem fully. Change-Id: Ib87e5d38797da166826af90659e3d05da3352dcf Related-Bug: #1741224
This commit is contained in:
parent
16e15b73b9
commit
254d1dee4b
|
@ -33,6 +33,11 @@ parameters:
|
||||||
via parameter_defaults in the resource registry.
|
via parameter_defaults in the resource registry.
|
||||||
type: json
|
type: json
|
||||||
|
|
||||||
|
OpenShiftGlobalVariables:
|
||||||
|
default: {}
|
||||||
|
description: Global Ansible variables for OpenShift-Ansible installer.
|
||||||
|
type: json
|
||||||
|
|
||||||
outputs:
|
outputs:
|
||||||
role_data:
|
role_data:
|
||||||
description: Role data for the Openshift Service
|
description: Role data for the Openshift Service
|
||||||
|
@ -95,9 +100,9 @@ outputs:
|
||||||
masters: {}
|
masters: {}
|
||||||
nodes: {}
|
nodes: {}
|
||||||
|
|
||||||
- name: generate openshift global vars
|
- name: generate openshift global defaults
|
||||||
copy:
|
copy:
|
||||||
dest: "{{playbook_dir}}/openshift/global_vars.yml"
|
dest: "{{playbook_dir}}/openshift/global_defaults.yml"
|
||||||
content: |
|
content: |
|
||||||
containerized: true
|
containerized: true
|
||||||
openshift_master_cluster_method: native
|
openshift_master_cluster_method: native
|
||||||
|
@ -110,7 +115,15 @@ outputs:
|
||||||
osm_etcd_image: "registry.fedoraproject.org/f27/etcd"
|
osm_etcd_image: "registry.fedoraproject.org/f27/etcd"
|
||||||
# NOTE(flaper87): Needed for the gate
|
# NOTE(flaper87): Needed for the gate
|
||||||
openshift_disable_check: disk_availability,docker_storage,memory_availability,docker_image_availability
|
openshift_disable_check: disk_availability,docker_storage,memory_availability,docker_image_availability
|
||||||
skip_ovs_svc_handlers: true
|
|
||||||
|
- name: set openshift global vars fact
|
||||||
|
set_fact:
|
||||||
|
openshift_global_vars: {get_param: OpenShiftGlobalVariables}
|
||||||
|
|
||||||
|
- name: generate openshift global vars
|
||||||
|
copy:
|
||||||
|
dest: "{{playbook_dir}}/openshift/global_vars.yml"
|
||||||
|
content: "{{openshift_global_vars|to_nice_yaml}}"
|
||||||
|
|
||||||
- name: generate openshift playbook
|
- name: generate openshift playbook
|
||||||
copy:
|
copy:
|
||||||
|
@ -162,6 +175,7 @@ outputs:
|
||||||
ANSIBLE_HOST_KEY_CHECKING=False
|
ANSIBLE_HOST_KEY_CHECKING=False
|
||||||
ansible-playbook
|
ansible-playbook
|
||||||
-i '{{playbook_dir}}/openshift/inventory.yml'
|
-i '{{playbook_dir}}/openshift/inventory.yml'
|
||||||
|
--extra-vars '@{{playbook_dir}}/openshift/global_defaults.yml'
|
||||||
--extra-vars '@{{playbook_dir}}/openshift/global_vars.yml'
|
--extra-vars '@{{playbook_dir}}/openshift/global_vars.yml'
|
||||||
'{{playbook_dir}}/openshift/playbook.yml'
|
'{{playbook_dir}}/openshift/playbook.yml'
|
||||||
{%- endif -%}
|
{%- endif -%}
|
||||||
|
|
Loading…
Reference in New Issue