summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix conflicts in spec fileTim Bielawa2016-09-2911-5/+214
|
* Merge pull request #2527 from lhuard1A/fix_cloudprovider_openstack_keystonev3Scott Dodson2016-09-294-3/+19
|\ | | | | Set the DomainName or DomainID in the OpenStack cloud provider
| * Set the DomainName or DomainID in the OpenStack cloud providerLénaïc Huard2016-09-294-3/+19
|/ | | | | | | | Whereas with the OpenStack keystone v2 authentication API, the username and the password are enough, the keystone v3 API requires an additional domain parameter. Fixes #2515
* Merge pull request #2518 from abutcher/quiet-timeScott Dodson2016-09-2813-8/+57
|\ | | | | Reduce warning output
| * Use ansible.module_utils._text.to_text instead of ↵Andrew Butcher2016-09-281-2/+10
| | | | | | | | ansible.utils.unicode.to_unicode.
| * Suppress more warnings.Andrew Butcher2016-09-2812-6/+47
| |
* | Merge pull request #2520 from rbo/openshift_cockpit_deployer_prefixAndrew Butcher2016-09-281-4/+1
|\ \ | | | | | | Don't set IMAGE_PREFIX if openshift_cockpit_deployer_prefix is empty
| * | Don't set IMAGE_PREFIX if openshift_cockpit_deployer_prefix is emptyRobert Bohne2016-09-281-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If openshift_cockpit_deployer_prefix was empty then they called "-p IMAGE_PREFIX=" and this overwrite the template default. For example: ``` grep -A1 -B1 'name: IMAGE_PREFIX' examples/infrastructure-templates/enterprise/registry-console.yaml - description: 'Specify "registry/repository" prefix for container image; e.g. for "registry.access.redhat.com/openshift3/registry-console:latest", set prefix "registry.access.redhat.com/openshift3/"' name: IMAGE_PREFIX value: "registry.access.redhat.com/openshift3/" ```
* | | Merge pull request #2521 from sdodson/bz1377089Scott Dodson2016-09-282-4/+2
|\ \ \ | |/ / |/| | Add gitHTTPProxy and gitHTTPSProxy to advanced config json option
| * | Add gitHTTPProxy and gitHTTPSProxy to advanced config json optionScott Dodson2016-09-282-4/+2
| |/
* | Merge pull request #2506 from tbielawa/aoi-manpageScott Dodson2016-09-284-2/+377
|\ \ | |/ |/| Add a manpage for atomic-openshift-installer
| * Update spec file to install manpageTim Bielawa2016-09-282-11/+12
| |
| * Addresses most comments from @adellapeTim Bielawa2016-09-271-12/+12
| |
| * Add a manpage for atomic-openshift-installerTim Bielawa2016-09-273-0/+374
| |
* | Merge pull request #2508 from sdodson/fix-logging-templateScott Dodson2016-09-271-3/+2
|\ \ | | | | | | Fix deployer template for enterprise
| * | Fix deployer template for enterpriseScott Dodson2016-09-271-3/+2
|/ / | | | | | | See https://github.com/openshift/origin-aggregated-logging/pull/218
* | Merge pull request #2507 from lhuard1A/remove_openstack_dnsJason DeTiberus2016-09-276-245/+1
|\ \ | |/ |/| Remove the DNS VM on OpenStack
| * Remove the DNS VM on OpenStackLénaïc Huard2016-09-276-245/+1
|/
* Merge pull request #2500 from sdodson/masterScott Dodson2016-09-261-0/+5
|\ | | | | Add rhaos-3.4-rhel-7 releaser to tito
| * Add rhaos-3.4-rhel-7 releaser to titoScott Dodson2016-09-261-0/+5
| |
* | Merge pull request #2502 from sdodson/rhel-73-systemdScott Dodson2016-09-262-3/+5
|\ \ | | | | | | test fix for systemd changes
| * \ Merge pull request #4 from detiber/rhel-73-systemdScott Dodson2016-09-262-3/+3
| |\ \ | | | | | | | | tweak logic
| | * | tweak logicJason DeTiberus2016-09-262-3/+3
| |/ /
| * | test fix for systemd changesScott Dodson2016-09-262-3/+5
| | |
* | | Merge pull request #2501 from lhuard1A/fix_openstack_cloudproviderAndrew Butcher2016-09-2611-70/+118
|\ \ \ | | | | | | | | Fix openstack cloudprovider
| * | | Fix OpenStack cloud providerLénaïc Huard2016-09-267-17/+38
| | | |
| * | | Fix the nodeName of the OpenShift nodes on OpenStackLénaïc Huard2016-09-225-53/+80
| | | |
* | | | Merge pull request #2264 from bdurrow/patch-1Jason DeTiberus2016-09-261-1/+1
|\ \ \ \ | |_|/ / |/| | | Fix GCE Launch
| * | | Fix GCE LaunchBrad Durrow2016-08-071-1/+1
| | | | | | | | | | | | The Ansible GCE module (documentation here: http://docs.ansible.com/ansible/gce_module.html) requires a comma separated list when you pass an array here (even with a single element) the argument has square brackets around it and the instance doesn't get launched. Testing shows that joining with ', ' (comma space) works with one instance but breaks with two so I used ',' (comma no space).
* | | | Merge pull request #2499 from sdodson/masterScott Dodson2016-09-262-2/+108
|\ \ \ \ | | |_|/ | |/| | Automatic commit of package [openshift-ansible] release [3.4.2-1].
| * | | Automatic commit of package [openshift-ansible] release [3.4.2-1].Scott Dodson2016-09-262-2/+108
|/ / /
* | | Merge pull request #2473 from lhuard1A/openstack_inventoryJason DeTiberus2016-09-229-291/+268
|\ \ \ | | |/ | |/| Update the OpenStack dynamic inventory script
| * | Update the OpenStack dynamic inventory scriptLénaïc Huard2016-09-209-291/+268
| | |
* | | Merge pull request #2489 from andrewklau/routernameScott Dodson2016-09-222-0/+5
|\ \ \ | | | | | | | | Add openshift_hosted_router_name
| * | | Add openshift_hosted_router_nameAndrew Lau2016-09-222-0/+5
| | | |
* | | | Merge pull request #2493 from sdodson/issue_templateScott Dodson2016-09-221-0/+21
|\ \ \ \ | | | | | | | | | | Add an issue template
| * | | | Add an issue templateScott Dodson2016-09-221-0/+21
| |/ / /
* | | | Merge pull request #2484 from abutcher/gce-cloud-providerScott Dodson2016-09-223-0/+12
|\ \ \ \ | | | | | | | | | | Add GCE cloud provider kind.
| * | | | Add GCE cloud provider kind.Andrew Butcher2016-09-213-0/+12
| | | | |
* | | | | Merge pull request #2488 from abutcher/fix-master-status-changedScott Dodson2016-09-211-1/+5
|\ \ \ \ \ | |_|/ / / |/| | | | Fix master service status changed fact.
| * | | | Fix master service status changed fact.Andrew Butcher2016-09-211-1/+5
|/ / / /
* | | | Merge pull request #2486 from sdodson/metrics-public-urlScott Dodson2016-09-212-0/+4
|\ \ \ \ | | | | | | | | | | Clarify openshift_hosted_metrics_public_url
| * | | | Clarify openshift_hosted_metrics_public_urlScott Dodson2016-09-212-0/+4
|/ / / / | | | | | | | | | | | | | | | | | | | | Currently, metrics only works at /hawkular/metrics so if you alter the path portion of the variable then the master will direct traffic at an endpoint that won't work.
* | | | Merge pull request #2485 from yaacov/add-documentation-on-metrics-hostnameScott Dodson2016-09-211-0/+1
|\ \ \ \ | |/ / / |/| | | Add documentation about the openshift_hosted_metrics_public_url option
| * | | add documentation about the openshift_hosted_metrics_public_url optionyaacov2016-09-211-0/+1
|/ / /
* | | Merge pull request #2476 from sdodson/split_builddefaults_no_proxyScott Dodson2016-09-201-0/+3
|\ \ \ | | | | | | | | Split openshift_builddefaults_no_proxy if it's not a list
| * | | Split openshift_builddefaults_no_proxy if it's not a listScott Dodson2016-09-201-0/+3
| | | |
* | | | Merge pull request #2474 from sdodson/node-no-proxy-v2Scott Dodson2016-09-201-1/+1
|\| | | | | | | | | | | Fix references to openshift.master.sdn_cluster_network_cidr in node r…
| * | | Fix references to openshift.master.sdn_cluster_network_cidr in node rolesScott Dodson2016-09-201-1/+1
|/ / /
* | | Merge pull request #2472 from nak3/spec-licenseScott Dodson2016-09-202-13/+4
|\ \ \ | | | | | | | | move LICENSE to /usr/share/licenses/openshift-ansible-VERSION/
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-30 12:17:22 +0000