summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Additional overrides for cloud provider playbooksJason DeTiberus2016-02-014-0/+16
| | | | | - sdn overrides - allow overrides for use_flannel and use_fluentd
* Merge pull request #1309 from detiber/multi-masterStefanie Forrester2016-02-014-0/+4
|\ | | | | Multi-master fixes for provider playbooks
| * Multi-master fixes for provider playbooksJason DeTiberus2016-02-014-0/+4
| | | | | | | | | | - set openshift_master_cluster_method=native for all cloud providers so bin/cluster will build the ha masters correctly
* | Merge pull request #1310 from detiber/aws_hostnameStefanie Forrester2016-02-012-2/+0
|\ \ | |/ |/| Fix hostname for aws cloud provider
| * Fix hostname for aws cloud providerJason DeTiberus2016-01-292-2/+0
| | | | | | | | - No longer set openshift_hostname to the private ip for the instance
* | Merge pull request #1237 from detiber/infra_fixesBrenton Leanhardt2016-02-0110-75/+151
|\ \ | | | | | | infra_node fixes
| * | Added docs around oo_nodes_with_labelJason DeTiberus2016-02-011-49/+75
| | |
| * | fix for terminateJason DeTiberus2016-02-011-1/+1
| | |
| * | Fix node tags for aws providerJason DeTiberus2016-02-011-1/+1
| | |
| * | use yaml for loading lable info instead of jsonJason DeTiberus2016-02-011-1/+1
| | |
| * | infra_node fixesJason DeTiberus2016-02-019-30/+80
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - openshift_master role update - infra_nodes was previously being set to num_infra, which is an integer value when using the cloud providers, added a new variable osm_infra_nodes that is expected to be a list of hosts - if openshift_infra_nodes is not already set, create it from the nodes that have the region=infra label. - Cloud provider config playbook updates - override openshift_router_selector for cloud providers to avoid using the default of 'region=infra' when deployment_type is not 'online' - Set openshift_infra_nodes to g_infra_host for cloud providers
* | | Merge pull request #1316 from mwoodson/master_localMatt Woodson2016-02-011-2/+25
|\ \ \ | | | | | | | | zabbix: added master local api items and triggers
| * | | zabbix: added master local api items and triggersMatt Woodson2016-02-011-2/+25
| | | |
* | | | Merge pull request #1304 from jprovaznik/sleepBrenton Leanhardt2016-02-011-0/+1
|\ \ \ \ | |/ / / |/| | | Give openvswitch container some time to start
| * | | Give openvswitch container some time to startJan Provaznik2016-01-291-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | It's possible that openshift containers are started sooner than openvswitch starts/sets networking (this typically happens when docker service is restarted).
* | | | Merge pull request #1311 from sdodson/is-syncBrenton Leanhardt2016-02-015-109/+123
|\ \ \ \ | |_|/ / |/| | | Sync latest imagestreams
| * | | Fix missing bool filterScott Dodson2016-01-291-1/+1
| | | |
| * | | Sync platest imagestreamsScott Dodson2016-01-294-108/+122
| | | |
* | | | Automatic commit of package [openshift-ansible] release [3.0.37-1].Kenny Woodson2016-01-292-2/+36
| | | |
* | | | Merge pull request #1313 from kwoodson/ohi_ipsKenny Woodson2016-01-294-16/+52
|\ \ \ \ | | | | | | | | | | ohi supports ip now.
| * | | | Adding ip address optionKenny Woodson2016-01-294-16/+52
| |/ / /
* | | | Merge pull request #1114 from lhuard1A/fix_update_repos_and_packagesBrenton Leanhardt2016-01-293-2/+4
|\ \ \ \ | | | | | | | | | | Fix update_repos_and_packages playbook which now needs openshift_facts
| * | | | Move the `is_atomic` check from `update_repos_and_packages.yml` to ↵Lénaïc Huard2016-01-123-2/+4
| | | | | | | | | | | | | | | | | | | | `rhel_subscribe`
* | | | | Merge pull request #1133 from lhuard1A/increase_openstack_timeoutBrenton Leanhardt2016-01-292-2/+3
|\ \ \ \ \ | |_|/ / / |/| | | | Increase OpenStack stack creation/deletion timeout
| * | | | Increase OpenStack stack creation/deletion timeoutLénaïc Huard2016-01-082-2/+3
| | | | |
* | | | | Merge pull request #1300 from vishpat/bug1298Brenton Leanhardt2016-01-291-0/+1
|\ \ \ \ \ | | | | | | | | | | | | Fix for bug 1298
| * | | | | Fix for bug 1298Vishal Patil2016-01-281-0/+1
| | |_|/ / | |/| | |
* | | | | Merge pull request #1307 from abutcher/containerized-cockpitBrenton Leanhardt2016-01-291-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Enable cockpit when not is_atomic.
| * | | | | Enable cockpit when not is_atomic.Andrew Butcher2016-01-291-1/+1
| |/ / / /
* | | | | Merge pull request #1301 from vishpat/bug1299Brenton Leanhardt2016-01-291-0/+4
|\ \ \ \ \ | |/ / / / |/| | | | Explicitly restart the node service after configuring it for nuage
| * | | | Explicitly restart the atomic node service after configuring it for nuageVishal Patil2016-01-281-0/+4
|/ / / /
* | | | Merge pull request #1264 from gaelL/s3_registry_templateStefanie Forrester2016-01-281-0/+3
|\ \ \ \ | | | | | | | | | | adhoc s3 registry - add auth part in the registry config sample
| * | | | adhoc s3 registry - add auth part in the registry config samplegaelL2016-01-221-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Without the auth part, after spawning the registry we were not able to do an auth. ``` docker login -u .. -p ... 172.30.234.98:5000 Error response from daemon: no successful auth challenge forhttp://172.30.234.98:5000/v2/ - errors: [] ``` Simply adding this part in the registry config sample
* | | | | Merge pull request #1265 from talset/s3_registry_clusteridStefanie Forrester2016-01-282-4/+6
|\ \ \ \ \ | | | | | | | | | | | | Allow to have custom bucket name and region
| * | | | | Allow to have custom bucket name and regiontalset2016-01-282-4/+6
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | File playbooks/adhoc/s3_registry/s3_registry* To be able to use a different bucket name and region, aws_bucket and aws_region are now available * Add variable for region and bucket into j2 * Update comment Usage * Add default aws_bucket_name and aws_bucket_region
* | | | | Merge pull request #1288 from abutcher/container-logrotateBrenton Leanhardt2016-01-287-3/+13
|\ \ \ \ \ | | | | | | | | | | | | Configure logrotate on atomic.
| * | | | | Add inventory example for logrotate_scriptsAndrew Butcher2016-01-283-0/+12
| | | | | |
| * | | | | Configure logrotate on atomic.Andrew Butcher2016-01-274-3/+1
| | | | | |
* | | | | | Merge pull request #1294 from kwoodson/yaml_fixKenny Woodson2016-01-281-1/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fixed logic for skipping symlinks in jenkins checks.
| * | | | | | fixing logic for skipping symlinksKenny Woodson2016-01-281-1/+6
|/ / / / / /
* | | | | | Merge pull request #1290 from joelddiaz/sky-templateJoel Diaz2016-01-281-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | fix template trigger calc
| * | | | | | fix template trigger calcJoel Diaz2016-01-281-2/+2
| |/ / / / /
* | | | | | Merge pull request #1292 from brenton/masterBrenton Leanhardt2016-01-281-3/+3
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Minor readme cleanup for Bug 1271566
| * | | | | Minor readme cleanup for Bug 1271566Brenton Leanhardt2016-01-281-3/+3
|/ / / / /
* | | | | Merge pull request #1286 from kwoodson/zbx_host_fixKenny Woodson2016-01-261-1/+20
|\ \ \ \ \ | | | | | | | | | | | | Fixed zbx_host interface comparison and removed duplicate hostgroup names for input.
| * | | | | Comparing zbx_host interfaces and removing duplicate hostgroup_namesKenny Woodson2016-01-261-1/+20
| | | | | |
* | | | | | Merge pull request #1273 from lhuard1A/fix_oo_pretty_print_clusterThomas Wiest2016-01-261-19/+21
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix `oo_pretty_print_cluster` following the renaming of `env` into `clusterid`
| * | | | | | Fix oo_pretty_print_cluster following the renaming of `env` into `clusterid`Lénaïc Huard2016-01-261-19/+21
| | | | | | |
* | | | | | | Merge pull request #1274 from rassie/patch-1Brenton Leanhardt2016-01-261-2/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix checking for update package availability
| * | | | | | | Fix checking for update package availabilityNikolai Prokoschenko2016-01-261-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, if `yum list available` returns two versions, for whatever reason, no sorting is imposed. Therefore it's possible that an upgraded package version is available but is not being detected. This patch sorts the version number list so that most recent version is always picked first.