summaryrefslogtreecommitdiffstats
path: root/roles/openshift_master/templates/master.yaml.v1.j2
Commit message (Collapse)AuthorAgeFilesLines
...
* Add support for configuring oauth templates.Devan Goodwin2016-04-011-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow users who wish to deploy configs with ansible to define templates for oauth screens, and control the alwaysShowProviderSelection setting. There are currently three supported oauth templates, and we have a pre-existing 'oauth_template' variable, but it is assumed to mean you are controlling the 'login' screen, and this is the only one you can configure. To work around this, supporting all current and future templates, introduce a pluralized variable 'oauth_templates', which contains a JSON dict allowing the admin to control any template they wish. If both new and old variables are defined, the old one is ignored. (and can be considered deprecated) Internally the old value will be converted to the new dict, so the template just references one value. Example: openshift_master_oauth_always_show_provider_selection=true openshift_master_oauth_templates={"providerSelection": "provider-selection.html", "error": "oauth-error.html"} Yeilds: oauthConfig: alwaysShowProviderSelection: true templates: error: oauth-error.html providerSelection: provider-selection.html
* Add support for templating master admissionConfig.Devan Goodwin2016-04-011-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds four new inventory variables for setting sections in "admissionConfig" and "kubernetesMasterConfig.admissionConfig". openshift_master_admission_plugin_order allows configuring the list of origin admission controller plugins to enable and what order to run them in. This must be a JSON formatted list of strings: openshift_master_admission_plugin_order=["RunOnceDuration", "NamespaceLifecycle", "OriginPodNodeEnvironment", "ClusterResourceOverride", "LimitRanger", "ServiceAccount", "SecurityContextConstraint", "ResourceQuota", "SCCExecRestrictions"] openshift_master_kube_admission_plugin_order is identical but for the kubernetes admission controller plugins which appear beneath kubernetesMasterConfig. openshift_master_admission_plugin_config allows setting free-form configuration stanzas that match up with enabled admission controller plugins. This must be a JSON formatted hash: openshift_master_admission_plugin_config={"RunOnceDuration":{"configuration":{"apiVersion":"v1","kind":"RunOnceDurationConfig","activeDeadlineSecondsOverride":3600}},"ClusterResourceOverride":{"configuration":{"apiVersion":"v1","kind":"ClusterResourceOverrideConfig","limitCPUToMemoryPercent":200,"cpuRequestToLimitPercent":6,"memoryRequestToLimitPercent":60}}} openshift_master_kube_admission_plugin_config is the equivalent for kubernetes admission controller plugins. Contains a change to merge_facts to fix issues with modifying inventory variables that contain JSON dicts. If you modified a previously set variable, the result would be a merge of old and new, which is completely wrong in this case. Addded new overwrite_facts to shortcut to just taking the new values. This differs from the pre-existing concept of "protected" in that we're not protecting an old value, we're trashing it and taking the new.
* Add gte check for 3.2, update version checks to gteJason DeTiberus2016-02-091-2/+2
|
* Merge pull request #1160 from vishpat/nuageBrenton Leanhardt2016-01-251-1/+1
|\ | | | | Nuage
| * Add Nuage support to openshift ansibleVishal Patil2016-01-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added variables Made changes for node configuration Add service restart logic to node Fixed ansible syntax errors Add cert and key info for nodes Added active and standby controller ip configuration information Uncommented the nuage sdn check Changed ca_crt -> ca_cert Added restarting of atomic openshift master Removed service account dependencies Fixes Fixed the api server url Removed redundant restart of atomic openshift master Configure nuagekubemon on all of the master nodes Restart master api and controllers as well on nuagekubemon installation Converted plugin config into template Add template for nuagekubemon Removed uplink interface from vars Able to copy cert keys Uninstall default ovs Add the kubemon template Do not install rdo sdn rpms in case of nuage Addressed latest review comments Set the networkPluginName for nuage
* | Expose console config for customizationDiego Castro2016-01-211-1/+14
| |
* | Enable kubernetes master config of podEvictionTimeout from ansibleJeremiah Stuever2016-01-201-1/+1
| |
* | - sqashed to one commitLutz Lange2016-01-121-2/+2
| |
* | Merge pull request #1018 from abutcher/secretsBrenton Leanhardt2016-01-061-0/+2
|\ \ | | | | | | Clean up idempotency issues with session secrets.
| * | Clean up idempotency issues with session secrets.Andrew Butcher2016-01-041-0/+2
| | |
* | | Fix osm_controller_args and osm_api_server_args settings.Andrew Butcher2016-01-041-2/+2
|/ /
* / add the necessary URLs for logging and metricsgit0012015-12-221-0/+6
|/ | | | | | | | | | | | | | add the necessary URLs for logging and metrics use the dict in the right way add the new variables into the hosts file add the new variables into the hosts file add the new variables into the hosts file Adopted the config text
* Configured master count should be 1 for pacemaker ha.Andrew Butcher2015-12-021-1/+1
|
* Refactor master identity provider configurationJason DeTiberus2015-11-231-1/+18
| | | | | | - Remote template in favor of a filter plugin - Add additional validation for identity provider config - Add mappingMethod attribute for identity providers, default to 'claim'
* Refactor named certificates.Andrew Butcher2015-11-161-5/+2
|
* 1279746: Fix leftover disabled features line in config template.Devan Goodwin2015-11-101-1/+0
|
* Merge pull request #830 from detiber/nov1beta3Brenton Leanhardt2015-11-061-3/+3
|\ | | | | apiLevel changes
| * apiLevel changesJason DeTiberus2015-11-061-3/+3
| | | | | | | | | | | | - remove kubernetesMasterConfig.apiLevels if >= 3.1/1.1 - change apiLevels conditional from using deployment_type to version_greater_than_3_1_or_1_1
* | Revert to defaultsAndrew Butcher2015-11-051-3/+3
| |
* | fix dueling controllers - without controllerLeaseTTL set in config, multiple ↵Jason DeTiberus2015-11-041-1/+3
| | | | | | | | controllers will attempt to start
* | additional ha related updatesJason DeTiberus2015-11-041-5/+13
| |
* | additional native ha changesAndrew Butcher2015-11-041-2/+1
|/
* Filter internal hostnames from the list of parsed names.Andrew Butcher2015-11-031-1/+1
|
* Add custom certificates to serving info in master configuration.Andrew Butcher2015-11-031-0/+14
|
* Disable OpenShift features if installing Atomic EnterpriseJason DeTiberus2015-10-301-0/+3
|
* Conditionalizing the support for the v1beta3 apiBrenton Leanhardt2015-10-291-0/+4
| | | | | v1beta3 is only supported on OSE 3.0. For 3.0 the deployment_type was "enterprise"
* Merge pull request #731 from abutcher/proxy-client-configBrenton Leanhardt2015-10-271-0/+3
|\ | | | | Add proxy client certs to master config
| * Add proxy client certs to master config.Andrew Butcher2015-10-221-0/+3
| |
* | Fix quotesDiego Castro2015-10-261-1/+1
| |
* | Add missing quotesDiego Castro2015-10-231-6/+6
| |
* | fix merge conflictsDiego Castro2015-10-221-9/+7
|\|
| * Fix yaml indentation from use_openshift_sdn conditionalAndrew Butcher2015-10-201-2/+2
| |
| * Allow disabling the network plugin configurationTomas Sedovic2015-10-201-0/+2
| | | | | | | | | | | | This is useful when we want to use a different networking solution without having any networking plugin code run when the services start up.
| * Move openshift_data_dir to a fact based on deployment_typeScott Dodson2015-09-101-1/+1
| | | | | | | | | | | | Previously this was being set to /var/lib/origin regardless of deployment_type which isn't correct given that existing 'enterprise' and 'online' deployments would have been deployed with /var/lib/openshift
| * Add serviceNetworkCIDR to network configScott Dodson2015-09-021-0/+2
| | | | | | | | Required by OSE 3.0.2 and Origin 1.0.6
| * Fix quoting around nullJason DeTiberus2015-08-221-2/+2
| |
| * fix apiServerArguments and controllerServerArgumentsJason DeTiberus2015-08-221-8/+2
| |
* | Get default values from openshift_factsDiego Castro2015-08-171-6/+6
| |
* | Merge remote-tracking branch 'openshift/master' into project_configDiego Castro2015-08-151-0/+6
|\|
| * Add support for setting kubeletArguments, controllerArguments, and ↵Jason DeTiberus2015-08-131-0/+6
| | | | | | | | apiServerArguments
| * Add support for setting default node selectorJason DeTiberus2015-08-121-1/+1
| |
* | Update PR #458 from commentsDiego Castro2015-08-121-1/+8
| |
* | Custom Project ConfigDiego Castro2015-08-121-9/+1
|/
* Fix Custom CorsDiego Castro2015-08-121-1/+3
|
* Add support for setting routingConfig:subdomainJason DeTiberus2015-07-281-1/+1
|
* Add masterCA to ServiceAccountConfigScott Dodson2015-07-211-0/+1
|
* Etcd role updates and playbook updatesJason DeTiberus2015-07-101-4/+4
| | | | | | | | | | | | | | | | | | | | | - fix firewall conflict issues with co-located etcd and openshift hosts - added os_firewall dependency to etcd role - updated etcd template to better handle clustered and non-clustered installs - added etcd_ca role - generates a self-signed cert to manage etcd certificates, since etcd peer certificates are required to be client and server certs and the openshift ca will only generate client or server certs (not one authorized for both). - renamed openshift_etcd_certs role to etcd_certificates and updated it to manage certificates generated from the CA managed by the etcd_ca role - remove hard coded etcd_port in openshift_facts - updates for the openshift-etcd common playbook - removed etcd and openshift-etcd playbooks from the byo playbooks directory - added a common playbook for setting etcd launch facts - added an openshift-etcd common service playbook - removed unused variables - fixed tests for embedded_{etcd,dns,kube} in openshift_master - removed old workaround for reloading systemd units
* Changes related to latest openshift.Avesh Agarwal2015-06-301-2/+4
|
* Update for RC2 changesScott Dodson2015-06-161-5/+24
| | | | | | | | | | | | | Remove openshift-deployer.kubeconfig from master template Sync config template Update enterprise image names Switch to node auto registration Add deployer to list of serviceAccountConfig.managedNames Move package installation before registering facts change default kubeconfig location Change system:openshift-client to system:openshift-master Rename node cert/key/kubeconfig per openshift/origin#3160 Update references to /var/lib/openshift/openshift.local.certificates
* Templatize configs and 0.5.2 changesJason DeTiberus2015-06-101-0/+98
- Templatize node config - Templatize master config - Integrated sdn changes - Updates for openshift_facts - Added support for node, master and sdn related changes - registry_url - added identity provider facts - Removed openshift_sdn_* roles - Install httpd-tools if configuring htpasswd auth - Remove references to external_id - Setting external_id interferes with nodes associating with the generated node object when pre-registering nodes. - osc/oc and osadm/oadm binary detection in openshift_facts Misc Changes: - make non-errata puddle default for byo example - comment out master in list of nodes in inventory/byo/hosts - remove non-error errors from fluentd_* roles - Use admin kubeconfig instead of openshift-client