| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
| |
In a project where contributors are free to use whatever editor they
want and we have linting tools that verify the proper formatting of
Python files, it should not be required to have a vim-specific line in
Python files.
|
| |
|
|\
| |
| | |
Merged by openshift-bot
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This change allows for the use of either the traditional package install
of docker OR a system container install of docker.
Two new inventory options, openshift_docker_use_system_container and
openshift_docker_systemcontainer_image_registry_override, have been
added which are be used to install with a system container. By default
this option is commented out.
One new fact has been added:
- docker.service_name: docker by default, container-engine-docker
for system container
|
|/ |
|
| |
|
|
|
|
| |
Signed-off-by: Jose A. Rivera <jarrpa@redhat.com>
|
|
|
|
| |
Signed-off-by: Jose A. Rivera <jarrpa@redhat.com>
|
|\
| |
| | |
Merged by openshift-bot
|
| | |
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
It turns out the code in
roles/openshift_health_checker/openshift_checks/__init__.py had a
mistake in the import statement, and not the case that `add_metaclass`
is not available in the embedded `six` from `ansible.module_utils`.
The fix is to correct the import and do not require python-six to be
installed on target hosts.
Note: now that we have some unit tests in the role, errors like that
would have been caught.
|
| |
| |
| |
| |
| | |
Embedded version of six in Ansible 2.2.1 does not support add_metaclass,
so revert to using python-six.
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
In openshift_repos and everywhere, ensure deployment_type and
openshift_deployment_type are defined and the same.
We really want to set openshift_deployment_type, but users will likely
still have just deployment_type, so accept both. And don't make every
playbook default openshift_deployment_type to deployment_type.
This introduces the openshift_sanitize_inventory role to run before anything else.
|
|/ |
|
| |
|
|\
| |
| |
| |
| | |
EricMountain-1A/fix_upstream_docker_registries_order
Preserve order of Docker registries
|
| |
| |
| |
| |
| |
| | |
List of additional/blocked/insecure Docker registries was being converted
to a set, thereby dropping the original order. Fixed to preserve order
of the registries (this allows prioritising registries).
|
|/
|
|
| |
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
|
|\
| |
| | |
Fails Installation If Docker Version is Too Old On Atomic Host
|
| |
| |
| |
| |
| |
| |
| | |
If the docker version on a master or node is under 1.12 and the OS is an
Atomic Host variant the installation should fail.
Fixes: BZ1425583
|
|\ \
| |/
|/| |
Pull request for Contiv Ansible code integration into Openshift Ansible
|
| |
| |
| |
| | |
into Openshift Ansible. This is the first (beta) release of Contiv with Openshift and is only supported for Openshift Origin + Bare metal deployments at the time of this commit. Please refer to the Openshift and Contiv official documentation for details of the level of support for different features and modes of operation.
|
| |
| |
| |
| |
| |
| | |
Origin 1.6 and future releases will be versioned as Origin 3.6+. This
unifies a point of inconsistency and brings Origin in line with the full
release history. Update version numbers to match that 3.x is preferred.
|
| |
| |
| |
| |
| |
| |
| |
| | |
do not attempt to compare the version using LooseVersion when 'latest'
is used. The case openshift_version == None already sets to use the
last version, so simply reuse that.
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
For a few reasons; among them that we currently have a dependency on `PyYAML`
which on Fedora Atomic Host isn't installed for Python 2 by default. Further,
many dependencies are being ported in Fedora to be Python 3.
Conversely, ensure that we're using Python 2 everywhere else (which is really
CentOS/RHEL), since AFAIK we don't test that path at all, and we really don't
need *more* entries in the supported matrix.
|
|/
|
|
| |
This reverts commit 0b1c1c2c524bfb932ab0e15f63f464673c00e651.
|
|
|
|
| |
openshift_master_facts available within the role
|
|
|
|
|
| |
* Speed improvements as a side-effect of skipping the tasks in future
includes of `openshift_facts`
|
|
|
|
|
|
|
|
| |
If a host had /etc/openshift but not /etc/origin we were setting the
config_base to /etc/openshift in some places but not all. This code was
transitional in order to migrate between 3.0 and 3.1. Given that current
playbooks are only supported when moving from the previous version to
current version this should no longer be necessary.
|
| |
|
|
|
|
| |
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Use use_system_containers=true in the inventory file
alternatively you can select each component as:
use_openvswitch_system_container=true
use_node_system_container=true
use_master_system_container=true
system_images_registry holds the registry from where to fetch system
containers.
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
|
|
|
|
| |
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
|
| |
|
| |
|
|\
| |
| | |
Create v3_5 upgrade playbooks
|
| | |
|
|/
|
|
|
| |
Data is only available under ['instance'] and split was in the wrong
order. This deploys against GCE for me.
|
| |
|
|
|
|
| |
string everywhere it is used.
|
| |
|
| |
|
| |
|
| |
|
|\
| |
| | |
add configuration for build default+overrides settings
|
| | |
|
|/
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
I came across this:
Traceback (most recent call last):
File "/tmp/ansible_BhXpTE/ansible_module_openshift_facts.py", line 2409, in <module>
main()
File "/tmp/ansible_BhXpTE/ansible_module_openshift_facts.py", line 2396, in main
protected_facts_to_overwrite)
File "/tmp/ansible_BhXpTE/ansible_module_openshift_facts.py", line 1855, in __init__
protected_facts_to_overwrite)
File "/tmp/ansible_BhXpTE/ansible_module_openshift_facts.py", line 1892, in generate_facts
defaults = self.get_defaults(roles, deployment_type, deployment_subtype)
File "/tmp/ansible_BhXpTE/ansible_module_openshift_facts.py", line 1989, in get_defaults
version_info = get_docker_version_info()
File "/tmp/ansible_BhXpTE/ansible_module_openshift_facts.py", line 1290, in get_docker_version_info
if is_service_running('docker'):
File "/tmp/ansible_BhXpTE/ansible_module_openshift_facts.py", line 1249, in is_service_running
bus = SystemBus()
File "/usr/lib64/python2.7/site-packages/dbus/_dbus.py", line 194, in __new__
private=private)
File "/usr/lib64/python2.7/site-packages/dbus/_dbus.py", line 100, in __new__
bus = BusConnection.__new__(subclass, bus_type, mainloop=mainloop)
File "/usr/lib64/python2.7/site-packages/dbus/bus.py", line 122, in __new__
bus = cls._new_for_bus(address_or_type, mainloop=mainloop)
dbus.exceptions.DBusException: org.freedesktop.DBus.Error.FileNotFound: Failed to connect to socket /var/run/dbus/system_bus_socket: No such file or directory
|
|
|
|
| |
Closes #3070
|
|\
| |
| | |
More Toxification
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
- Move pylint tests to tox
- Move yamllint tests to tox
- Create separate tox config (and setup.py) for root
- bump ansible requirement
- unify pylint config
- add docs
- remove git directory containing old testing tools
- install python-six if not present for openshift-facts
- add python-six as a dependency for openshift-ansible-utils
|