summaryrefslogtreecommitdiffstats
path: root/roles/openshift_master
Commit message (Collapse)AuthorAgeFilesLines
* Simplify is_master_system_container logicMichael Gugino2017-11-273-5/+7
| | | | Simplify the variable is_master_system_container
* Merge pull request #6231 from mtnbikenc/include-deprecation-openshift-masterRussell Teague2017-11-223-15/+14
|\ | | | | Include Deprecation - openshift-master
| * Include Deprecation - openshift-masterRussell Teague2017-11-223-15/+14
| |
* | Fix system_images_registry variableMichael Gugino2017-11-222-3/+9
|/ | | | Simplify the logic for this variable.
* Merge pull request #6084 from mgugino-upstream-stage/combine-master-upgradeOpenShift Merge Robot2017-11-158-3/+298
|\ | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Combine master upgrade play with role Currently, there are plays importing tasks directly from openshift_master role. This has caused numerous bugs and code duplicaiton in the past. This commit combines the upgrade into openshift_master role utilizing include_role syntax.
| * Combine master upgrade play with roleMichael Gugino2017-11-098-3/+298
| | | | | | | | | | | | | | | | | | Currently, there are plays importing tasks directly from openshift_master role. This has caused numerous bugs and code duplicaiton in the past. This commit combines the upgrade into openshift_master role utilizing include_role syntax.
* | Merge pull request #5968 from mgugino-upstream-stage/version-scrubScott Dodson2017-11-154-55/+1
|\ \ | | | | | | Removed old version code
| * | Removed old version codeMichael Gugino2017-11-144-55/+1
| | | | | | | | | | | | | | | | | | This commit removes any references to versions < 1.5/3.5 We assume the version is always greater than or equal to 1.5/3.5.
* | | Merge pull request #6094 from ↵OpenShift Merge Robot2017-11-152-0/+21
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mgugino-upstream-stage/syscontainers-docker-login-module Automatic merge from submit-queue. Alternative method to create docker registry auth creds Currently, the command 'docker login' is run when using oreg with authentication. On some hosts, such as hosts configured to use system containers, the docker service is not running. 'docker login' will fail without the docker service running. This commit adds a module to idempotently add credentials to the registry credentials file without the use of 'docker login' Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1511374
| * | Alternative method to create docker registry auth credsMichael Gugino2017-11-142-0/+21
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, the command 'docker login' is run when using oreg with authentication. On some hosts, such as hosts configured to use system containers, the docker service is not running. 'docker login' will fail without the docker service running. This commit adds a module to idempotently add credentials to the registry credentials file without the use of 'docker login' Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1511374
* / Regex anchors changed to match protocol start and ports.Kenny Woodson2017-11-131-2/+2
|/
* Merge pull request #6016 from kwoodson/bootstrap_enhancements-v3Kenny Woodson2017-11-084-158/+20
|\ | | | | Bootstrap enhancements.
| * Bootstrap enhancements.Kenny Woodson2017-11-084-158/+20
| |
* | Retry restarting master controllersMichael Gugino2017-11-061-3/+6
| | | | | | | | | | | | | | | | | | Currently, master controller services may fail to restart if master api services are not fully initialized. This commit enables retry of master controllers. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1509837
* | Revert "Bootstrap enhancements."Clayton Coleman2017-11-054-20/+81
| |
* | Merge pull request #6006 from mgugino-upstream-stage/elb-v2OpenShift Merge Robot2017-11-034-81/+20
|\ \ | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Bootstrap enhancements. This includes the elb work.
| * | Bootstrap enhancements.Kenny Woodson2017-11-034-81/+20
| |/
* / Fix master upgrade version detect and systemd enableMichael Gugino2017-11-031-0/+11
|/ | | | | Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1508755 Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1509158
* Merge pull request #5972 from smarterclayton/default_mtuOpenShift Merge Robot2017-11-011-2/+2
|\ | | | | | | | | | | | | | | | | Automatic merge from submit-queue. MTU for bootstrapping should default to openshift_node_sdn_mtu The default value needs to be consistently used. @kwoodson
| * MTU for bootstrapping should default to openshift_node_sdn_mtuClayton Coleman2017-10-311-2/+2
| | | | | | | | The default value needs to be consistently used.
* | Merge pull request #5971 from smarterclayton/retry_createOpenShift Merge Robot2017-11-011-0/+3
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Retry service account bootstrap kubeconfig creation Pulled back from the larger refactor so this job can be enabled. @kwoodson back porting so I can turn the job on
| * | Retry service account bootstrap kubeconfig creationClayton Coleman2017-10-311-0/+3
| |/ | | | | | | Pulled back from the larger refactor so this job can be enabled.
* | Merge pull request #5264 from AlexanderZagaynov/cors_escapeOpenShift Merge Robot2017-11-011-2/+3
|\ \ | |/ |/| | | | | | | | | | | | | | | Automatic merge from submit-queue. escape corsAllowedOrigins regexp strings and anchor them `corsAllowedOrigins` parameter got interpreted by OpenShift/Kubernetes as a regular expression (there is a bug about that: https://bugzilla.redhat.com/show_bug.cgi?id=1482903). It leads to some vague behaviour, like for `127.0.0.1` value `127a0b0c1` will be matched as valid, as well as `localhost.example.com` for `localhost`. I've added regexp escaping here, as well as value anchoring to the begin and end of the string. I've also added case-insensitive flag `(?i)` to match values like `LocalHost` for `localhost`.
| * fix comment and make it visible to end-userAlexander Zagaynov2017-09-051-2/+3
| |
| * escape also custom_cors_originsAlexander Zagaynov2017-08-301-1/+1
| |
| * add comment on regexp specificsAlexander Zagaynov2017-08-301-1/+1
| |
| * escape corsAllowedOrigins regexp strings and anchor themAlexander Zagaynov2017-08-301-1/+1
| |
* | Merge pull request #5936 from sdodson/arbitrary-fw-rulesOpenShift Merge Robot2017-10-311-1/+3
|\ \ | | | | | | | | | | | | Automatic merge from submit-queue. Add arbitrary firewall port config to master too
| * | Add arbitrary firewall port config to master tooScott Dodson2017-10-301-1/+3
| | |
* | | Merge pull request #5929 from ↵OpenShift Merge Robot2017-10-312-10/+15
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ingvagabund/remove-master-service-during-non-ha-to-ha-upgrade Automatic merge from submit-queue. remove master.service during the non-ha to ha upgrade Bug: 1506165
| * | | remove master.service during the non-ha to ha upgradeJan Chaloupka2017-10-302-10/+15
| | | |
* | | | Merge pull request #5924 from smarterclayton/bootstrap_cleanupOpenShift Merge Robot2017-10-312-1/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. GCP cannot use growpart utils from AWS due to conflicting package Allow cloud provider specific packages to be specified. Also, fix a wait condition in openshift_gcp to allow masters to be bootstrapped nodes. @kwoodson
| * | | | Use global IP to indicate node should pick DNSClayton Coleman2017-10-301-0/+1
| | | | |
| * | | | Use openshift.node.registry_url instead of oreg_urlClayton Coleman2017-10-301-1/+1
| | |/ / | |/| | | | | | | | | | Consistent with other use
* | | | Merge pull request #5932 from mgugino-upstream-stage/retry-docker-credsOpenShift Merge Robot2017-10-311-0/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Add retry logic to docker auth credentials This commit enables retry on docker login commands. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1506931
| * | | | Add retry logic to docker auth credentialsMichael Gugino2017-10-301-0/+3
| | |/ / | |/| | | | | | | | | | | | | | | | | | This commit enables retry on docker login commands. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1506931
* | | | Merge pull request #5930 from mgugino-upstream-stage/retry-journald-restartScott Dodson2017-10-311-3/+5
|\ \ \ \ | | | | | | | | | | Retry restarting journald
| * | | | Retry restarting journaldMichael Gugino2017-10-301-3/+5
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sometimes journald fails to restart cleanly during upgrades. This commit retries restarting 3 times. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1506141
* | / / Removing unneeded bootstrap which moved into the product.Kenny Woodson2017-10-301-17/+0
| |/ / |/| |
* | | Merge pull request #5864 from JacobTanenbaum/new-CIDROpenShift Merge Robot2017-10-301-0/+5
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | Automatic merge from submit-queue. add new clusterNetworks fields to new installs add clusterNetworks field to the networkConfig so that the new fields appear in new installs
| * | add new clusterNetworks fields to new installsJacob Tanenbaum2017-10-271-0/+5
| | | | | | | | | | | | | | | add clusterNetworks field to the networkConfig so that the new fields appear in new installs when openshift version is greater then 3.7
* | | Merge pull request #5882 from mgugino-upstream-stage/persistent-journald-logsScott Dodson2017-10-261-0/+5
|\ \ \ | | | | | | | | Ensure journald persistence directories exist
| * | | Ensure journald persistence directories existMichael Gugino2017-10-251-0/+5
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, we configure openshfit masters to modify journald to use persistent storage. The directory structure must be created manually according to documentation. This commit ensures the needed directory is created. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1506141
* / / Remove pause from master service startupRussell Teague2017-10-251-27/+3
|/ / | | | | | | | | Fixes 1505537 https://bugzilla.redhat.com/show_bug.cgi?id=1505537
* | Merge pull request #5796 from mgugino-upstream-stage/journald-masters-upgradesOpenShift Merge Robot2017-10-242-22/+25
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Ensure upgrades apply latest journald settings Currently, existing clusters might not have journald configurations applied. This may result in a rate- limiting of important log messages on openshift-masters. This commit ensures that journald settings are applied during the upgrade process openshif-masters. Fixes: https://github.com/openshift/openshift-ansible/issues/5642
| * | Ensure upgrades apply latest journald settingsMichael Gugino2017-10-182-22/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, existing clusters might not have journald configurations applied. This may result in a rate- limiting of important log messages on openshift-masters. This commit ensures that journald settings are applied during the upgrade process openshif-masters. Fixes: https://github.com/openshift/openshift-ansible/issues/5642
* | | Merge pull request #5654 from vshn/mastersysconfigvar1OpenShift Merge Robot2017-10-231-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Avoid undefined variable in master sysconfig template When "openshift_master_controllers_env_vars" is set, but "openshift_master_api_env_vars" isn't, the template for the sysconfig file of atomic-openshift-master fails: AnsibleUndefinedVariable: 'dict object' has no attribute 'api_env_vars' Avoid this issue by applying "default({})" to the dict and always calling ".items()".
| * | | Avoid undefined variable in master sysconfig templateMichael Hanselmann2017-10-191-1/+1
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When "openshift_master_controllers_env_vars" is set, but "openshift_master_api_env_vars" isn't, the template for the sysconfig file of atomic-openshift-master fails: AnsibleUndefinedVariable: 'dict object' has no attribute 'api_env_vars' Avoid this issue by applying "default({})" to the dict and always calling ".items()".
* | | Merge pull request #5813 from ashcrow/1503903OpenShift Merge Robot2017-10-231-0/+5
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Always ensure atomic.conf is configured for system containers. A new openshift_atomic role has been created for atomic specific tasks. The first task added is proxy which handles updating /etc/atomic.conf to ensure the proper proxy configuration is configured. This task file is then included (via include_role) in system container related task files. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1503903
| * | | systemcontainers: Verify atomic.conf proxy is always configuredSteve Milner2017-10-191-0/+5
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A new openshift_atomic role has been created for atomic specific tasks. The first task added is proxy which handles updating /etc/atomic.conf to ensure the proper proxy configuration is configured. This task file is then included (via include_role) in system container related task files. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1503903 Signed-off-by: Steve Milner <smilner@redhat.com>