summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2017-10-02Merge pull request #5619 from ashcrow/1497274OpenShift Merge Robot
Automatic merge from submit-queue. openshift_checks: Fix incorrect list cast ``docker_image_availability`` casted ``openshift_docker_additional_registries`` to a list using the ``list()`` function. If a string was returned (IE: only a single registry added) the result would be the string split up by component characters. This change forces a string result from ``get_var`` to be placed inside a list. If the result is anything BUT a string the original ``list()`` function is called on the result. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1497274 Resolves #5610
2017-10-02Merge pull request #5608 from jarrpa/empty-optionOpenShift Merge Robot
Automatic merge from submit-queue. lib/base: Allow for empty option value Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1483923 Signed-off-by: Jose A. Rivera <jarrpa@redhat.com>
2017-10-02Automatic commit of package [openshift-ansible] release [3.7.0-0.139.0].Jenkins CD Merge Bot
Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
2017-10-02Move node aws credentials to config.ymlMichael Gugino
Currently, the node service is started before aws credentials (if needed) are configured. This commit ensures the aws credentials are placed before the node service is started. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1497150
2017-10-02Merge pull request #5600 from ewolinetz/bz1496352OpenShift Merge Robot
Automatic merge from submit-queue. Reverting using uninstall variables for logging and metrics Reverting using `uninstall` variables for logging and metrics. Addresses bug and comments in https://bugzilla.redhat.com/show_bug.cgi?id=1496352
2017-10-02Limit base-package install during master upgradesMichael Gugino
Currently, openshift_version installs RPM packages on all nodes and masters to aid in determining and setting the proper version across the cluster. This commit limits the host groups to only masters during upgrade_control_plane plays. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1495107
2017-10-02Merge pull request #5562 from ttindell2/masterOpenShift Merge Robot
Automatic merge from submit-queue. Fix Heketi Deployment without external registry access #5550 Updated task to use the --image flag. The Image will now be set to: {{ glusterfs_heketi_image}}:{{ glusterfs_heketi_version }} This means that the user can specify an internal registry if needed. Created ticket with heketi: heketi/heketi#870
2017-10-02Adding the option to use 'stack_state' to allow for easy de-provisioning (#754)Øystein Bedin
* Adding 'openstack-stack-delete' role to allow for easy de-provisioning * Updated per etsauer's comments
2017-10-02Use etcd_ip when communicating with the cluster as a peer in etcd scaleup.Andrew Butcher
2017-10-02Update ansible-service-broker config to track latest brokerFabian von Feilitzsch
bring ansible service broker up to date with bearer token changes etcd -> 0.0.0.0 add auth information to broker resource in catalog add sandbox role to config simplify defaults add labels to oc_route use new oc_route label field Fix parameter ordering add port back Fix secret syntax
2017-10-02Restore registires to /etc/sysconfig/dockerMichael Gugino
Previously, a commit was added to migrate registires from /etc/sysconfig/docker to /etc/containers/registries.conf We are not currently enforcing a minimum version of docker to consume from this new file, thus some installations are not utilizing the correct repositories. This commit duplicates the registires in both locations to ensure additional/blocked/insecure registries are honored.
2017-10-02Merge pull request #5622 from simo5/yammlintScott Dodson
Fix mispelling in error message yammlint -> yamllint
2017-10-02Merge pull request #5510 from abutcher/separate-certsOpenShift Merge Robot
Automatic merge from submit-queue. Break out certificate playbooks Break out certificate role dependencies and move them into their own playbooks.
2017-10-02Adding role to clean up pvs (#769)Eric Sauer
2017-10-02openshift_checks: Fix incorrect list castSteve Milner
docker_image_availability casted openshift_docker_additional_registries to a list using the list() function. If a string was returned (IE: only a single registry added) the result would be the string split up by component characters. This change forces a string result from get_var to be placed inside a list. If the result is anything BUT a string the original list() function is called on the result. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1497274 Signed-off-by: Steve Milner <smilner@redhat.com>
2017-10-02Automatic commit of package [openshift-ansible] release [3.7.0-0.138.0].Jenkins CD Merge Bot
Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
2017-10-02Fix mispelling in error message yammlint -> yamllintSimo Sorce
Signed-off-by: Simo Sorce <simo@redhat.com>
2017-10-02Merge pull request #5609 from jarrpa/heketi-account-permsOpenShift Merge Robot
Automatic merge from submit-queue. GlusterFS: make ServiceAccounts privileged when either glusterfs or heketi is native Resolves https://bugzilla.redhat.com/show_bug.cgi?id=1486187 Signed-off-by: Jose A. Rivera <jarrpa@redhat.com>
2017-10-02add ospDavis Phillips
2017-10-02Ensure openshift.common.portal_net updated during scaleup.Andrew Butcher
2017-10-02check for provider and skip disable if its definedDavis Phillips
2017-10-02fix master-facts for provisioningMichael Gugino
2017-10-02Make provisioning steps more reusableMichael Gugino
Reorganizing and making some of the plays more reusable.
2017-10-02Merge pull request #5618 from vshn/defstorageclasstyp1Scott Dodson
Fix typo in openshift_default_storage_class/README
2017-10-02Fix typo in openshift_default_storage_class/READMEMichael Hanselmann
2017-10-02Merge pull request #5589 from mgugino-upstream-stage/provision-var-fixes-masterJan Chaloupka
Fix some provisioning variables
2017-10-02Separate certificate playbooks.Andrew Butcher
2017-10-02Fix Prometheus byo entry pointRussell Teague
2017-10-02logging: honor openshift_logging_es_cpu_limitJan Wozniak
PR https://github.com/openshift/openshift-ansible/pull/3509 has removed any usage of `openshift_logging_es_cpu_limit`. Currently, the `openshift_logging_elasticsearch_cpu_limit` is either default '1000m' or derived from `openshift_logging_es_ops_cpu_limit` but if user sets the `openshift_logging_es_cpu_limit` in the inventory as documented, its value is ignored. This PR fixes the issue by trying to set openshift_logging_elasticsearch_cpu_limit=openshift_logging_es_cpu_limit And including the role as -ops overrides this setting.
2017-10-02version bump for upgrade plays (#770)Ryan Cook
* version bump for upgrade plays
2017-10-02Automatic commit of package [openshift-ansible] release [3.7.0-0.137.0].Jenkins CD Merge Bot
Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
2017-10-01Update to the openshift_aws style scheme for variablesClayton Coleman
Corresponding changes will be made to the other repositories after merge.
2017-10-01Merge pull request #5599 from ashcrow/node-start-fixOpenShift Merge Robot
Automatic merge from submit-queue. openshift_node: Set DOCKER_SERVICE for system container The node system container was being installed with the ```DOCKER_SERVICE``` holding to it's ```manifest.json``` default of docker.service. This chage adds the ```DOCKER_SERVICE``` parameter on node system container install so that it uses the same value from the installer stored in ```openshift.docker.service_name```. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1496707
2017-10-01Automatic commit of package [openshift-ansible] release [3.7.0-0.136.0].Jenkins CD Merge Bot
Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
2017-09-30Merge pull request #5449 from abutcher/wildcard-router-cert-redeployOpenShift Merge Robot
Automatic merge from submit-queue. Bug 1490186: Router pod not running after router certificates redeployment This carries https://github.com/openshift/openshift-ansible/pull/5417. More of the router cert redeploy logic could be moved into the `openshift_hosted` role with a flag. I may pull those over. https://bugzilla.redhat.com/show_bug.cgi?id=1490186
2017-09-30Merge pull request #5593 from ingvagabund/block-upgrade-if-etcd3-not-setJan Chaloupka
block 3.6->3.7 upgrade if storage backend is not set to etcd3
2017-09-29Merge pull request #5565 from mgugino-upstream-stage/provisioning-centos-supportOpenShift Merge Robot
Automatic merge from submit-queue. Changes necessary to support AMI building Currently, AMI building does not work. These changes implement the necessary steps to build an AMI for usage as a 'golden node image'.
2017-09-30Automatic commit of package [openshift-ansible] release [3.7.0-0.135.0].Jenkins CD Merge Bot
Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
2017-09-29GlusterFS: make ServiceAccounts privileged when either glusterfs or heketi ↵Jose A. Rivera
is native Signed-off-by: Jose A. Rivera <jarrpa@redhat.com>
2017-09-29Merge pull request #5595 from mgugino-upstream-stage/reg-auth-variable-fixOpenShift Merge Robot
Automatic merge from submit-queue. Fix registry auth variable There is currently a bug in registry auth credential creation logic for openshift_node and openshift_node_upgrade This commit fixes the logic.
2017-09-29Merge pull request #5601 from detiber/openshift_repos_fixOpenShift Merge Robot
Automatic merge from submit-queue. fix whitespace for centos repos This addresses an issue where repo files were missing a newline between the enabled and gpgkey entries. Current repo file content: ``` [centos-openshift-origin] name=CentOS OpenShift Origin baseurl=http://mirror.centos.org/centos/7/paas/x86_64/openshift-origin/ enabled=1 gpgcheck=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-PaaS [centos-openshift-origin-testing] name=CentOS OpenShift Origin Testing baseurl=http://buildlogs.centos.org/centos/7/paas/x86_64/openshift-origin/ enabled=0gpgcheck=0 gpgkey=file:///etc/pki/rpm-gpg/openshift-ansible-CentOS-SIG-PaaS [centos-openshift-origin-debuginfo] name=CentOS OpenShift Origin DebugInfo baseurl=http://debuginfo.centos.org/centos/7/paas/x86_64/ enabled=0 gpgcheck=1 gpgkey=file:///etc/pki/rpm-gpg/openshift-ansible-CentOS-SIG-PaaS [centos-openshift-origin-source] name=CentOS OpenShift Origin Source baseurl=http://vault.centos.org/centos/7/paas/Source/openshift-origin/ enabled=0 gpgcheck=1 gpgkey=file:///etc/pki/rpm-gpg/openshift-ansible-CentOS-SIG-PaaS ``` Expected content: ``` [centos-openshift-origin] name=CentOS OpenShift Origin baseurl=http://mirror.centos.org/centos/7/paas/x86_64/openshift-origin/ enabled=1 gpgcheck=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-PaaS [centos-openshift-origin-testing] name=CentOS OpenShift Origin Testing baseurl=http://buildlogs.centos.org/centos/7/paas/x86_64/openshift-origin/ enabled=0 gpgcheck=0 gpgkey=file:///etc/pki/rpm-gpg/openshift-ansible-CentOS-SIG-PaaS [centos-openshift-origin-debuginfo] name=CentOS OpenShift Origin DebugInfo baseurl=http://debuginfo.centos.org/centos/7/paas/x86_64/ enabled=0 gpgcheck=1 gpgkey=file:///etc/pki/rpm-gpg/openshift-ansible-CentOS-SIG-PaaS [centos-openshift-origin-source] name=CentOS OpenShift Origin Source baseurl=http://vault.centos.org/centos/7/paas/Source/openshift-origin/ enabled=0 gpgcheck=1 gpgkey=file:///etc/pki/rpm-gpg/openshift-ansible-CentOS-SIG-PaaS ```
2017-09-29lib/base: Allow for empty option valueJose A. Rivera
Signed-off-by: Jose A. Rivera <jarrpa@redhat.com>
2017-09-29Merge pull request #5575 from ewolinetz/bz1470623Scott Dodson
Registering the broker for TSB
2017-09-29Fix provisiong scale group and elb logicMichael Gugino
Some changes necessary to support provisioning and scale group logic
2017-09-29Addressing tox issuesEric Wolinetz
2017-09-29Merge pull request #5577 from ashcrow/1496725OpenShift Merge Robot
Automatic merge from submit-queue. openshift_facts: coerce docker_use_system_container to bool Use ``safe_get_bool()`` when reading ``docker_use_system_container`` to ensure that ansible accepted inputs are turned into real boolean results. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1496725 3.6 Backport: https://github.com/openshift/openshift-ansible/pull/5578
2017-09-29Reverting using uninstall variables for logging and metricsEric Wolinetz
2017-09-29fix whitespace for centos reposJason DeTiberus
2017-09-29openshift_node: Add MASTER_SERVICE on system container installSteve Milner
Setting the MASTER_SERVICE to openshift.common.service_type. Signed-off-by: Steve Milner <smilner@redhat.com>
2017-09-29openshift_node: Set DOCKER_SERVICE for system containerSteve Milner
The node system container was being installed with the DOCKER_SERVICE holding to it's manifest.json default of docker.service. This change adds the DOCKER_SERVICE parameter on node system container install so that it uses the same value from the installer stored in openshift.docker.service_name. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1496707 Signed-off-by: Steve Milner <smilner@redhat.com>