summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #1403 from mwoodson/awsMatt Woodson2016-02-151-0/+14
|\ | | | | oo_filter: added custom fitler to return hosts group info
| * oo_filter: added custom fitler to return hosts group infoMatt Woodson2016-02-151-0/+14
|/
* Merge pull request #1399 from smunilla/BZ1308440Brenton Leanhardt2016-02-151-4/+8
|\ | | | | a-o-i: Count nativeha hosts as "installed" for scaleup
| * a-o-i: Count nativeha hosts as "installed" for scaleupSamuel Munilla2016-02-151-4/+8
| |
* | Merge pull request #1400 from joelddiaz/ansible-bin-gceJoel Diaz2016-02-151-0/+2
|\ \ | | | | | | add gce softlink for openshift-ansible-bin RPM
| * | add gce softlink for openshift-ansible-bin RPMJoel Diaz2016-02-151-0/+2
|/ /
* | Merge pull request #1398 from smunilla/BZ1308313Brenton Leanhardt2016-02-151-0/+1
|\ \ | | | | | | a-o-i: Add master_routingconfig_subdomain to PERSIST_SETTINGS
| * | a-o-i: Add master_routingconfig_subdomain to PERSIST_SETTINGSSamuel Munilla2016-02-151-0/+1
| |/ | | | | | | Fix for BZ1308313
* | Merge pull request #1397 from brenton/bz1308314Brenton Leanhardt2016-02-152-2/+2
|\ \ | | | | | | Bug 1308314 - Failed to continue installation when pressing CTRL-C
| * | Bug 1308412 - Fail to install containerized HA master env on RHEL7Brenton Leanhardt2016-02-151-1/+1
| | |
| * | Bug 1308314 - Failed to continue installation when pressing CTRL-CBrenton Leanhardt2016-02-151-1/+1
| |/
* | Merge pull request #1395 from brenton/masterBrenton Leanhardt2016-02-152-1/+11
|\ \ | |/ |/| Updating the 3.1.1 router to match the new liveness probe configuration
| * Updating the 3.1.1 router to match the new liveness probe configurationBrenton Leanhardt2016-02-122-1/+11
| |
* | Merge pull request #1369 from lhuard1A/gce_oo_optionThomas Wiest2016-02-151-4/+4
|\ \ | | | | | | Make the GCE image_name and the machine_type configurable from the CLI
| * | Make the GCE image_name and the machine_type configurable from the CLILénaïc Huard2016-02-101-4/+4
| | |
* | | Merge pull request #1355 from lhuard1A/fix_when_no_infraThomas Wiest2016-02-154-8/+8
|\ \ \ | | | | | | | | Fix issue when there are no infra nodes
| * | | Fix issue when there are no infra nodesLénaïc Huard2016-02-094-8/+8
| |/ /
* | | Merge pull request #1357 from lhuard1A/pretty_print_gce_list_clusterThomas Wiest2016-02-151-2/+9
|\ \ \ | | | | | | | | Better structure the output of the list playbook
| * | | Better structure the output of the list playbookLénaïc Huard2016-02-091-2/+9
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The list playbook listed the IPs of the VMs without logging their role like: ``` PLAY [List instance(s)] ******************************************************* TASK: [debug ] **************************************************************** ok: [lenaic-node-compute-cd81b] => { "msg": "public ip: 104.155.50.164 private ip:10.55.0.49" } ok: [lenaic-master-9e767] => { "msg": "public ip: 104.155.47.180 private ip:10.55.0.113" } ok: [lenaic-node-infra-ab7c8] => { "msg": "public ip: 104.155.11.34 private ip:10.55.0.131" } ``` The list playbook now prints the information in a more structured way like: ``` PLAY [List Hosts] ************************************************************* TASK: [debug ] **************************************************************** ok: [localhost] => { "msg": { "lenaic": { "master": { "default": [ { "name": "lenaic-master-9e767", "private IP": "10.55.0.113", "public IP": "104.155.47.180" } ] }, "node": { "compute": [ { "name": "lenaic-node-compute-cd81b", "private IP": "10.55.0.49", "public IP": "104.155.50.164" } ], "infra": [ { "name": "lenaic-node-infra-ab7c8", "private IP": "10.55.0.131", "public IP": "104.155.11.34" } ] } } } } ``` This change of the output of the list playbook was previously done for OpenStack and libvirt in 332aa8c (#461). This change makes the GCE output identical to OpenStack and libvirt’s one.
* | | Merge pull request #1388 from smunilla/minor_upgradesBrenton Leanhardt2016-02-122-10/+32
|\ \ \ | |_|/ |/| | a-o-i: Prompts to allow minor upgrades
| * | a-o-i: Prompts to allow minor upgradesSamuel Munilla2016-02-122-10/+32
| | | | | | | | | | | | | | | Updates to the upgrade command to allow the user to select a minor upgrade.
* | | Merge pull request #1394 from liggitt/system-authenticated-oauthBrenton Leanhardt2016-02-122-0/+2
|\ \ \ | | | | | | | | Don't automatically give additional permissions to all OAuth users on upgrade
| * | | Don't automatically give additional permissions to all OAuth users on upgradeJordan Liggitt2016-02-122-0/+2
|/ / /
* | | Merge pull request #1393 from detiber/adhoc_bootstrap_fedoraBrenton Leanhardt2016-02-121-1/+0
|\ \ \ | | | | | | | | Fix adhoc boostrap fedora playbook
| * | | Fix adhoc boostrap fedora playbookJason DeTiberus2016-02-121-1/+0
|/ / /
* | | Merge pull request #1392 from lhuard1A/manage_etc_hosts_falseBrenton Leanhardt2016-02-121-1/+0
|\ \ \ | | | | | | | | Fix libvirt cluster creation
| * | | Fix libvirt cluster creationLénaïc Huard2016-02-121-1/+0
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Doing a `bin/cluster create libvirt …` fails with the following error: ``` TASK: [Warn user about bad openshift_hostname values] ************************* [lenaic-node-compute-cf3fb, lenaic-node-compute-f39d3, lenaic-node-infra-0407f, lenaic-master-fc5f9] The hostname "lenaic-node-compute-cf3fb.example.com" for "lenaic-node-compute-cf3fb.example.com" doesn't resolve to an ip address owned by this host. Please set openshift_hostname variable to a hostname that when resolved on the host in question resolves to an IP address matching an interface on this host. This host will fail liveness checks for pods utilizing hostPorts, press CTRL-C to continue.: ``` because the `/etc/hosts` of the VM is containing: ``` [openshift@lenaic-node-compute-cf3fb ~]$ cat /etc/hosts # Your system has configured 'manage_etc_hosts' as True. # As a result, if you wish for changes to this file to persist # then you will need to either # a.) make changes to the master file in /etc/cloud/templates/hosts.redhat.tmpl # b.) change or remove the value of 'manage_etc_hosts' in # /etc/cloud/cloud.cfg or cloud-config from user-data # # The following lines are desirable for IPv4 capable hosts 127.0.0.1 lenaic-node-compute-cf3fb.example.com lenaic-node-compute-cf3fb 127.0.0.1 localhost.localdomain localhost 127.0.0.1 localhost4.localdomain4 localhost4 # The following lines are desirable for IPv6 capable hosts ::1 lenaic-node-compute-cf3fb.example.com lenaic-node-compute-cf3fb ::1 localhost.localdomain localhost ::1 localhost6.localdomain6 localhost6 ``` Disabling `manage_etc_hosts` removes the lines for `lenaic-node-compute-cf3fb` from `/etc/hosts` and makes than name resolved by the DNS to its real IP.
* | | Merge pull request #1391 from lhuard1A/labelsBrenton Leanhardt2016-02-122-0/+19
|\ \ \ | | | | | | | | Add missing `type` node labels on OpenStack and libvirt
| * | | Add missing `type` node labels on OpenStack and libvirtLénaïc Huard2016-02-122-0/+19
| |/ /
* | | Merge pull request #1390 from vishpat/nuage_parameter_changesBrenton Leanhardt2016-02-127-23/+23
|\ \ \ | | | | | | | | Changes for new Nuage RPMS
| * | | Changes for new Nuage RPMSVishal Patil2016-02-117-23/+23
| | | |
* | | | Merge pull request #1362 from detiber/fixLoopbackBrenton Leanhardt2016-02-123-34/+38
|\ \ \ \ | |_|/ / |/| | | Fix loopback cluster name, context name, and user
| * | | conditionalize loopback config on v >= 3.2/1.2Jason DeTiberus2016-02-113-32/+35
| | | |
| * | | Fix loopback cluster name, context name, and userJason DeTiberus2016-02-111-2/+3
| | | |
* | | | Merge pull request #1324 from abutcher/fluentd-fixesBrenton Leanhardt2016-02-1112-210/+0
|\ \ \ \ | | | | | | | | | | Remove fluentd_master and fluentd_node roles
| * | | | Remove fluentd_master and fluentd_node roles.Andrew Butcher2016-02-0812-202/+0
| | | | |
| * | | | Remove etcd up checks from fluentd_master.Andrew Butcher2016-02-041-8/+0
| | | | |
* | | | | Merge pull request #1386 from detiber/pv_fixesBrenton Leanhardt2016-02-112-2/+4
|\ \ \ \ \ | | | | | | | | | | | | Fixes pv/pvc creation for latest builds
| * | | | | Fixes pv/pvc creation for latest buildsJason DeTiberus2016-02-112-2/+4
|/ / / / /
* | | | | Merge pull request #1377 from brenton/bz1302970Brenton Leanhardt2016-02-114-22/+71
|\ \ \ \ \ | |_|/ / / |/| | | | Bug 1302970 - update script does not patch router if name is differen…
| * | | | Bug 1302970 - update script does not patch router if name is different from ↵Brenton Leanhardt2016-02-114-22/+71
|/ / / / | | | | | | | | | | | | default
* | | | Automatic commit of package [openshift-ansible] release [3.0.40-1].Brenton Leanhardt2016-02-112-2/+36
| | | |
* | | | Merge pull request #1383 from brenton/bz1306665Brenton Leanhardt2016-02-111-1/+1
|\ \ \ \ | |_|/ / |/| | | Bug 1306665 - [metrics] update metrics-deployer template to use lates…
| * | | Bug 1306665 - [metrics] update metrics-deployer template to use latest image ↵Brenton Leanhardt2016-02-111-1/+1
|/ / / | | | | | | | | | versions
* | | Merge pull request #1367 from detiber/githubOrgBrenton Leanhardt2016-02-111-7/+20
|\ \ \ | | | | | | | | Add organizations attribute to github identity provider
| * | | Add organizations attribute to github identity providerJason DeTiberus2016-02-101-7/+20
| | | | | | | | | | | | | | | | - also fix location of mappingMethod in identityProviders config
* | | | Merge pull request #1380 from joelddiaz/zbx-action-user-diffJoel Diaz2016-02-101-2/+2
|\ \ \ \ | | | | | | | | | | use correct dict key
| * | | | use correct dict keyJoel Diaz2016-02-101-2/+2
|/ / / /
* | | | Merge pull request #1379 from joelddiaz/zbx-action-diffJoel Diaz2016-02-101-6/+6
|\ \ \ \ | | | | | | | | | | handle being passed an empty group list
| * | | | handle being passed an empty group listJoel Diaz2016-02-101-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | Previous version would have the behavior where when an empty list is passed, the zbx API call would return a list of all groups. So an action with no groups defined would default to having all groups added to the operations. Handle this by iterating one at a time through the list of provided groups. When an empty list is provided, and empty list is returned.