syscontainers: fix CRI-O and container-engine installation by giuseppe · Pull Request #6316 · openshift/openshift-ansible

giuseppe · 2017-11-29T21:01:27Z

Signed-off-by: Giuseppe Scrivano gscrivan@redhat.com

michaelgugino · 2017-11-30T14:11:28Z

roles/docker/tasks/systemcontainer_crio.yml

    l_crio_registries: "{{ l2_docker_additional_registries + ['docker.io'] }}"
 - set_fact:
    l_additional_crio_registries: "{{ '\"{}\"'.format('\", \"'.join(l_crio_registries)) }}"
+    l_is_node_system_container: "{{ (openshift_use_node_system_container | default(openshift_use_system_containers | default(false)) | bool) }}"


There is no need to use set_fact here.

We could do the same exact line in defaults/main.yml

michaelgugino · 2017-11-30T14:12:40Z

@giuseppe I have a large refactor of this role out that covers some of this type of thing: #6297

Your feedback on that patch would be appreciated.

giuseppe · 2017-11-30T14:24:01Z

if you are already addressing this issue in your PR, I am fine to close this one. I don't want to create merge conflicts for such a trivial change :-)

The only reason I've opened this PR is that the installation was failing for me, as openshift.common.is_node_system_container is not defined

michaelgugino · 2017-11-30T14:33:27Z

@giuseppe I'm hoping to merge my PR by tomorrow. If it doesn't ship, I can merge this one and rebase, not a big deal.

giuseppe · 2017-11-30T16:36:18Z

/retest

giuseppe · 2017-11-30T22:27:50Z

@michaelgugino I've done the change you requested

ashcrow · 2017-12-05T22:06:46Z

/test logging

giuseppe · 2017-12-06T15:41:55Z

I've pushed more patches to this PR to address also some other issues. I've not opened a new PR since the patch already present here is necessary as well.

giuseppe · 2017-12-06T15:43:00Z

/cc @runcom @ashcrow @michaelgugino @sdodson

ashcrow · 2017-12-06T15:44:01Z

@michaelgugino PTAL

michaelgugino · 2017-12-06T16:50:06Z

roles/openshift_version/meta/main.yml

  - cloud
 dependencies:
 - role: lib_utils
+- role: container_runtime


Please checkout my other patch to see the general direction that we're moving.

Container runtime will be setup as a prerequisite before openshift is deployed. It cannot be a meta-dependency of any other role.

michaelgugino · 2017-12-06T16:51:15Z

roles/openshift_version/meta/main.yml

 dependencies:
 - role: lib_utils
+- role: container_runtime
+- role: openshift_facts


Not sure this is necessary here.

I tried without openshift_facts and it was still failing

I'm happy to openshift_facts here if you like, that's not really going to change anything in this role, and it's essentially a 0 task import.

michaelgugino · 2017-12-06T16:53:09Z

filter_plugins/oo_filters.py

    return string.split(separator)


+def oo_list_to_dict(lst, separator='='):


Let's not do this. Let's have the user give us a dictionary and create a new variable. Since this isn't actually used by docker, no need to re-use docker's variables.

This is used by docker. it is used by daemon.json is the template for /etc/docker/container-daemon.json which is used by docker when running in a container. So in this case log-opts is exactly the same as openshift_docker_log_options

Okay, that sounds good then. I think in the future we should do the reverse, we've talked about the current inflexibility of the docker options as impemented. I think it would be better as a list of kv pairs, and we convert a deprecated list k=v.

giuseppe · 2017-12-06T18:35:48Z

@sdodson @ingvagabund could we enable container-engine in the system-containers CI tests (should be enough to openshift_docker_use_system_container=True? This would help us to catch earlier some of the issues fixed here.

michaelgugino · 2017-12-07T21:03:41Z

close and reopen, I think the CI was using the old job definition for crio.

michaelgugino · 2017-12-07T22:44:06Z

Close/reopen again. Updated tests weren't pushed yet, so the crio options for ansible playbook were still missing. Should be present now.

michaelgugino · 2017-12-08T00:39:31Z

openshift-eng/aos-cd-jobs#929

michaelgugino · 2017-12-08T04:09:02Z

This is the last missing piece: #6394

If someone wants to review that and merge it, it should unblock crio.

sdodson · 2017-12-08T14:00:19Z

/retest

ashcrow · 2017-12-08T17:15:33Z

ci/openshift-jenkins/install — Jenkins job failed.

Oddly enough CI says it's still running. I'll rebase this PR while @giuseppe is AFK.

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>

change introduced with 39cf508 Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>

giuseppe · 2017-12-08T17:45:21Z

@ashcrow thanks. I've just pushed a rebased version ⬆️

sdodson · 2017-12-08T17:51:59Z

Merging based on the previously green tests and the fact that this has only been rebased. Not having this merged is blocking other work.

openshift-ci-robot · 2017-12-08T18:58:25Z

@giuseppe: The following test failed, say /retest to rerun them all:

Test name	Commit	Details	Rerun command
ci/openshift-jenkins/install	`40d63b7`	link	`/test install`

Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

runcom · 2017-12-08T20:34:22Z

The CRI-O and Origin CI is still failing, right now with rpmbuild of openshift origin release

Automatic merge from submit-queue. Remove container_runtime from the openshift_version We meant to remove this before merging #6316

adelton · 2017-12-13T16:57:52Z

Is seems this merge has caused regressions #6464.

giuseppe requested a review from michaelgugino November 29, 2017 21:01

openshift-ci-robot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Nov 29, 2017

michaelgugino suggested changes Nov 30, 2017

View reviewed changes

giuseppe force-pushed the fix-syscontainers-installation branch from e5c86ff to 872accf Compare November 30, 2017 14:39

openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Dec 5, 2017

giuseppe force-pushed the fix-syscontainers-installation branch from 872accf to 2393ccb Compare December 5, 2017 08:53

openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Dec 5, 2017

giuseppe force-pushed the fix-syscontainers-installation branch from 2393ccb to 25d8a2e Compare December 6, 2017 15:39

openshift-ci-robot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Dec 6, 2017

giuseppe changed the title ~~crio: define and use l_is_node_system_container~~ syscontainers: fix CRI-O and container-engine installation Dec 6, 2017

openshift-ci-robot requested review from ashcrow, michaelgugino, runcom and sdodson December 6, 2017 15:43

giuseppe force-pushed the fix-syscontainers-installation branch 2 times, most recently from d17945e to 6807ee7 Compare December 6, 2017 16:20

michaelgugino suggested changes Dec 6, 2017

View reviewed changes

giuseppe force-pushed the fix-syscontainers-installation branch 2 times, most recently from 951ae60 to d7d7869 Compare December 6, 2017 18:24

michaelgugino closed this Dec 7, 2017

michaelgugino reopened this Dec 7, 2017

michaelgugino closed this Dec 8, 2017

michaelgugino reopened this Dec 8, 2017

michaelgugino mentioned this pull request Dec 8, 2017

[wip] Crio fix iptables #6395

Closed

openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Dec 8, 2017

giuseppe added 7 commits December 8, 2017 18:40

crio: define and use l_is_node_system_container

2ae1a09

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>

openshift_version: add dependency to container_runtime

26472ab

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>

openshift_version: define openshift_use_crio_only

5ee8df8

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>

openshift_version: add dependency to openshift_facts

7d7c4f3

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>

container-engine: log-opts is a dictionary in the daemon.json file

9c29b47

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>

container-engine: skip openshift_docker_log_driver when it is False

5431d12

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>

openshift_node: reintroduce restart of CRI-O.

40d63b7

change introduced with 39cf508 Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>

giuseppe force-pushed the fix-syscontainers-installation branch from b8065ce to 40d63b7 Compare December 8, 2017 17:44

openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Dec 8, 2017

sdodson merged commit 8b48428 into openshift:master Dec 8, 2017

sdodson mentioned this pull request Dec 8, 2017

Remove container_runtime from the openshift_version #6406

Merged

openshift-merge-robot added a commit that referenced this pull request Dec 11, 2017

Merge pull request #6406 from sdodson/remove-cr-dep

886f6ca

Automatic merge from submit-queue. Remove container_runtime from the openshift_version We meant to remove this before merging #6316

adelton mentioned this pull request Dec 13, 2017

Running playbooks/deploy_cluster.yml fails on RHEL 7.4 #6464

Closed

		return string.split(separator)


		def oo_list_to_dict(lst, separator='='):

Comments

Conversation

giuseppe commented Nov 29, 2017

Uh oh!

Choose a reason for hiding this comment

Uh oh!

michaelgugino commented Nov 30, 2017

Uh oh!

giuseppe commented Nov 30, 2017

Uh oh!

michaelgugino commented Nov 30, 2017

Uh oh!

giuseppe commented Nov 30, 2017

Uh oh!

giuseppe commented Nov 30, 2017

Uh oh!

ashcrow commented Dec 5, 2017

Uh oh!

giuseppe commented Dec 6, 2017

Uh oh!

giuseppe commented Dec 6, 2017

Uh oh!

ashcrow commented Dec 6, 2017

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

giuseppe commented Dec 6, 2017

Uh oh!

michaelgugino commented Dec 7, 2017

Uh oh!

michaelgugino commented Dec 7, 2017

Uh oh!

michaelgugino commented Dec 8, 2017

Uh oh!

michaelgugino commented Dec 8, 2017

Uh oh!

sdodson commented Dec 8, 2017

Uh oh!

ashcrow commented Dec 8, 2017

Uh oh!

giuseppe commented Dec 8, 2017

Uh oh!

sdodson commented Dec 8, 2017

Uh oh!

openshift-ci-robot commented Dec 8, 2017 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

runcom commented Dec 8, 2017

Uh oh!

adelton commented Dec 13, 2017

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants

openshift-ci-robot commented Dec 8, 2017 •

edited

Loading