summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #1303 from talset/s3_registry_clusteridStefanie Forrester2016-02-011-1/+1
|\ | | | | s3_registry no filter named 'lookup'
| * s3_registry no filter named 'lookup'talset2016-01-291-1/+1
| | | | | | | | | | | | | | * Added a default function for the lookup. * According to [1] added default(,true) to avoid empty string [1] https://github.com/openshift/openshift-ansible/blob/master/docs/best_practices_guide.adoc#filters
* | Merge pull request #1296 from rharrison10/rharriso/lib_dynRussell Harrison2016-02-014-0/+334
|\ \ | | | | | | Adding the lib_dyn role for the dyn_record module
| * | removing extraneous commentsRussell Harrison2016-01-311-118/+4
| | |
| * | Remove commented lines and fix pylint checkRussell Harrison2016-01-291-10/+5
| | |
| * | Cleaning up the dyn ansible module for mergingRussell Harrison2016-01-295-26/+12
| | |
| * | Fixing last pylint errorRussell Harrison2016-01-291-0/+3
| | |
| * | Fixing pylint errorsRussell Harrison2016-01-291-29/+28
| | |
| * | WIP adding the lib_dyn role for the dyn_record moduleRussell Harrison2016-01-287-0/+465
| | |
* | | Merge pull request #1321 from joelddiaz/ovs-rules-itemJoel Diaz2016-02-011-0/+6
|\ \ \ | | | | | | | | add item to hold number of stray OVS rules found/removed
| * | | add item to hold number of stray OVS rules found/removedJoel Diaz2016-02-011-0/+6
| | | |
* | | | Merge pull request #1319 from mwoodson/docker_storageMatt Woodson2016-02-011-1/+1
|\ \ \ \ | | | | | | | | | | changed adhoc playbook to match new host monitoring container
| * | | | changed adhoc playbook to match new host monitoring containerMatt Woodson2016-02-011-1/+1
|/ / / /
* | | | 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
| | | | | | |