Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Backport ansible-2.2 fixes #2651

Merged
merged 3 commits into from Oct 24, 2016
Merged

Backport ansible-2.2 fixes #2651

merged 3 commits into from Oct 24, 2016

Conversation

sdodson
Copy link
Member

@sdodson sdodson commented Oct 24, 2016 •
edited

Fixes Bug 1386654

Fixes #2479
Backports #2518
Backports #2630

Per https://bugzilla.redhat.com/show_bug.cgi?id=1386654#c5 "with_ clauses ALWAYS
evaluate before the when clause, otherwise we cannot use item and condition loop
iterations. So this is not a bug, just how ansible works. The default and
ternary filters can be used to avoid the undefined error."

@sdodson
Copy link
Member Author

sdodson commented Oct 24, 2016

Probably need to rebase this onto master then backport to 3.3 and 3.2, but running CI jobs real quick.

@sdodson
Copy link
Member Author

sdodson commented Oct 24, 2016

aos-ci-test

@openshift-bot
Copy link

dedb5d5 - State: success - All Test Contexts: aos-ci-jenkins/OS_unit_tests - Logs: https://aos-ci.s3.amazonaws.com/openshift/openshift-ansible/jenkins-openshift-ansible-2-unit-tests-402/dedb5d57ecfe6ab08fc5e8f04b9183a21bab19f5.txt

@openshift-bot
Copy link

dedb5d5 - State: success - All Test Contexts: "aos-ci-jenkins/OS_3.2_NOT_containerized, aos-ci-jenkins/OS_3.2_NOT_containerized_e2e_tests" - Logs: https://aos-ci.s3.amazonaws.com/openshift/openshift-ansible/jenkins-openshift-ansible-3-test-matrix-CONTAINERIZED=_NOT_containerized,OSE_VER=3.2,PYTHON=System-CPython-2.7,TOPOLOGY=openshift-cluster,TargetBranch=release-1.2,nodes=openshift-ansible-slave-421/dedb5d57ecfe6ab08fc5e8f04b9183a21bab19f5.txt

@openshift-bot
Copy link

dedb5d5 - State: success - All Test Contexts: "aos-ci-jenkins/OS_3.2_containerized, aos-ci-jenkins/OS_3.2_containerized_e2e_tests" - Logs: https://aos-ci.s3.amazonaws.com/openshift/openshift-ansible/jenkins-openshift-ansible-3-test-matrix-CONTAINERIZED=_containerized,OSE_VER=3.2,PYTHON=System-CPython-2.7,TOPOLOGY=openshift-cluster-containerized,TargetBranch=release-1.2,nodes=openshift-ansible-slave-421/dedb5d57ecfe6ab08fc5e8f04b9183a21bab19f5.txt

@sdodson
Copy link
Member Author

sdodson commented Oct 24, 2016

aos-ci-test

@sdodson
Copy link
Member Author

sdodson commented Oct 24, 2016

@abutcher PTAL, also any other Ansible 2.2 compat items we may have missed?

@abutcher
Copy link
Member

abutcher commented Oct 24, 2016 •
edited

@sdodson Templated with_items already backported so I think the only thing left would be #2630.

@openshift-bot
Copy link

4e7fa30 - State: success - All Test Contexts: aos-ci-jenkins/OS_unit_tests - Logs: https://aos-ci.s3.amazonaws.com/openshift/openshift-ansible/jenkins-openshift-ansible-2-unit-tests-403/4e7fa300cf16d2f0e880c7ef6ec1fdceb5c86b9a.txt

@openshift-bot
Copy link

4e7fa30 - State: success - All Test Contexts: "aos-ci-jenkins/OS_3.2_NOT_containerized, aos-ci-jenkins/OS_3.2_NOT_containerized_e2e_tests" - Logs: https://aos-ci.s3.amazonaws.com/openshift/openshift-ansible/jenkins-openshift-ansible-3-test-matrix-CONTAINERIZED=_NOT_containerized,OSE_VER=3.2,PYTHON=System-CPython-2.7,TOPOLOGY=openshift-cluster,TargetBranch=release-1.2,nodes=openshift-ansible-slave-422/4e7fa300cf16d2f0e880c7ef6ec1fdceb5c86b9a.txt

@openshift-bot
Copy link

4e7fa30 - State: success - All Test Contexts: "aos-ci-jenkins/OS_3.2_containerized, aos-ci-jenkins/OS_3.2_containerized_e2e_tests" - Logs: https://aos-ci.s3.amazonaws.com/openshift/openshift-ansible/jenkins-openshift-ansible-3-test-matrix-CONTAINERIZED=_containerized,OSE_VER=3.2,PYTHON=System-CPython-2.7,TOPOLOGY=openshift-cluster-containerized,TargetBranch=release-1.2,nodes=openshift-ansible-slave-422/4e7fa300cf16d2f0e880c7ef6ec1fdceb5c86b9a.txt

@sdodson
Copy link
Member Author

sdodson commented Oct 24, 2016

aos-ci-test

@openshift-bot
Copy link

8c2aff7 - State: success - All Test Contexts: aos-ci-jenkins/OS_unit_tests - Logs: https://aos-ci.s3.amazonaws.com/openshift/openshift-ansible/jenkins-openshift-ansible-2-unit-tests-408/8c2aff7416cbdf8fca6d4dd04d240d7a6937472f.txt

@openshift-bot
Copy link

8c2aff7 - State: success - All Test Contexts: "aos-ci-jenkins/OS_3.2_NOT_containerized, aos-ci-jenkins/OS_3.2_NOT_containerized_e2e_tests" - Logs: https://aos-ci.s3.amazonaws.com/openshift/openshift-ansible/jenkins-openshift-ansible-3-test-matrix-CONTAINERIZED=_NOT_containerized,OSE_VER=3.2,PYTHON=System-CPython-2.7,TOPOLOGY=openshift-cluster,TargetBranch=release-1.2,nodes=openshift-ansible-slave-427/8c2aff7416cbdf8fca6d4dd04d240d7a6937472f.txt

@sdodson sdodson changed the title Set default potentially undefined variables Backport ansible-2.2 fixes Oct 24, 2016
@openshift-bot
Copy link

8c2aff7 - State: success - All Test Contexts: "aos-ci-jenkins/OS_3.2_containerized, aos-ci-jenkins/OS_3.2_containerized_e2e_tests" - Logs: https://aos-ci.s3.amazonaws.com/openshift/openshift-ansible/jenkins-openshift-ansible-3-test-matrix-CONTAINERIZED=_containerized,OSE_VER=3.2,PYTHON=System-CPython-2.7,TOPOLOGY=openshift-cluster-containerized,TargetBranch=release-1.2,nodes=openshift-ansible-slave-427/8c2aff7416cbdf8fca6d4dd04d240d7a6937472f.txt

@sdodson
Copy link
Member Author

sdodson commented Oct 24, 2016

make ci doesn't exist on this branch, that's why this one is failing. @abutcher or @detiber PTAL need to get this in today if possible.

@sdodson sdodson merged commit 7d5326e into openshift:release-1.2 Oct 24, 2016
gundalow
gundalow reviewed Oct 24, 2016
View reviewed changes
roles/openshift_node/tasks/systemd_units.yml
@@ -56,12 +56,12 @@
create: true
with_items:
- regex: '^HTTP_PROXY='
line: "HTTP_PROXY={{ openshift.common.http_proxy }}"
line: "HTTP_PROXY={{ openshift.common.http_proxy | default('') }}"
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does this fix the issues reported in https://bugzilla.redhat.com/show_bug.cgi?id=1386654

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, in my testing it did.

@sdodson sdodson deleted the bug1386654 branch July 14, 2017 18:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@gundalow gundalow gundalow left review comments

@abutcher abutcher abutcher approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@sdodson @openshift-bot @abutcher @gundalow