allow networkConfig.ingressIPNetworkCIDRs to be configured #2538
Conversation
|
Can one of the admins verify this patch? |
|
Can one of the admins verify this patch?
|
|
ok to test |
|
aos-ci-test |
|
a59ddbf - 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-334/a59ddbfb046c672f6fc9aaebda88b20bed04916d.txt |
|
a59ddbf - State: error - All Test Contexts: aos-ci-jenkins/OS_3.4_containerized - Logs: https://aos-ci.s3.amazonaws.com/openshift/openshift-ansible/jenkins-openshift-ansible-3-test-matrix-CONTAINERIZED=_containerized,OSE_VER=3.4,PYTHON=System-CPython-2.7,TOPOLOGY=openshift-cluster-containerized,TargetBranch=master,nodes=openshift-ansible-slave-353/a59ddbfb046c672f6fc9aaebda88b20bed04916d.txt |
| @@ -164,6 +164,9 @@ networkConfig: | |||
| # serviceNetworkCIDR must match kubernetesMasterConfig.servicesSubnet | |||
| serviceNetworkCIDR: {{ openshift.common.portal_net }} | |||
| externalIPNetworkCIDRs: {{ openshift_master_external_ip_network_cidrs | default(["0.0.0.0/0"]) | to_padded_yaml(1,2) }} | |||
| {% if openshift_master_ingress_ip_network_cidr %} | |||
There was a problem hiding this comment.
Will need to check for defined somehow:
{% if openshift_master_ingress_ip_network_cidr is defined %}
|
a59ddbf - State: error - All Test Contexts: aos-ci-jenkins/OS_3.3_containerized - Logs: https://aos-ci.s3.amazonaws.com/openshift/openshift-ansible/jenkins-openshift-ansible-3-test-matrix-CONTAINERIZED=_containerized,OSE_VER=3.3,PYTHON=System-CPython-2.7,TOPOLOGY=openshift-cluster-containerized,TargetBranch=master,nodes=openshift-ansible-slave-353/a59ddbfb046c672f6fc9aaebda88b20bed04916d.txt |
|
a59ddbf - State: error - All Test Contexts: aos-ci-jenkins/OS_3.3_NOT_containerized - Logs: https://aos-ci.s3.amazonaws.com/openshift/openshift-ansible/jenkins-openshift-ansible-3-test-matrix-CONTAINERIZED=_NOT_containerized,OSE_VER=3.3,PYTHON=System-CPython-2.7,TOPOLOGY=openshift-cluster,TargetBranch=master,nodes=openshift-ansible-slave-353/a59ddbfb046c672f6fc9aaebda88b20bed04916d.txt |
|
a59ddbf - State: error - All Test Contexts: aos-ci-jenkins/OS_3.4_NOT_containerized - Logs: https://aos-ci.s3.amazonaws.com/openshift/openshift-ansible/jenkins-openshift-ansible-3-test-matrix-CONTAINERIZED=_NOT_containerized,OSE_VER=3.4,PYTHON=System-CPython-2.7,TOPOLOGY=openshift-cluster,TargetBranch=master,nodes=openshift-ansible-slave-353/a59ddbfb046c672f6fc9aaebda88b20bed04916d.txt |
Signed-off-by: Mathias Merscher <Mathias.Merscher@dg-i.net>
Signed-off-by: Mathias Merscher <Mathias.Merscher@dg-i.net>
|
@abutcher Sorry, you're right. I've added the check, could you run the tests again? |
|
aos-ci-test |
|
cbc6a42 - 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-336/cbc6a4256e6efa0c8080720c51ec254843a08677.txt |
|
cbc6a42 - State: success - All Test Contexts: "aos-ci-jenkins/OS_3.3_containerized, aos-ci-jenkins/OS_3.3_containerized_e2e_tests" - Logs: https://aos-ci.s3.amazonaws.com/openshift/openshift-ansible/jenkins-openshift-ansible-3-test-matrix-CONTAINERIZED=_containerized,OSE_VER=3.3,PYTHON=System-CPython-2.7,TOPOLOGY=openshift-cluster-containerized,TargetBranch=master,nodes=openshift-ansible-slave-355/cbc6a4256e6efa0c8080720c51ec254843a08677.txt |
|
cbc6a42 - State: success - All Test Contexts: "aos-ci-jenkins/OS_3.3_NOT_containerized, aos-ci-jenkins/OS_3.3_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.3,PYTHON=System-CPython-2.7,TOPOLOGY=openshift-cluster,TargetBranch=master,nodes=openshift-ansible-slave-355/cbc6a4256e6efa0c8080720c51ec254843a08677.txt |
|
cbc6a42 - State: success - All Test Contexts: "aos-ci-jenkins/OS_3.4_containerized, aos-ci-jenkins/OS_3.4_containerized_e2e_tests" - Logs: https://aos-ci.s3.amazonaws.com/openshift/openshift-ansible/jenkins-openshift-ansible-3-test-matrix-CONTAINERIZED=_containerized,OSE_VER=3.4,PYTHON=System-CPython-2.7,TOPOLOGY=openshift-cluster-containerized,TargetBranch=master,nodes=openshift-ansible-slave-355/cbc6a4256e6efa0c8080720c51ec254843a08677.txt |
|
cbc6a42 - State: success - All Test Contexts: "aos-ci-jenkins/OS_3.4_NOT_containerized, aos-ci-jenkins/OS_3.4_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.4,PYTHON=System-CPython-2.7,TOPOLOGY=openshift-cluster,TargetBranch=master,nodes=openshift-ansible-slave-355/cbc6a4256e6efa0c8080720c51ec254843a08677.txt |
Make networkConfig.ingressIPNetworkCIDRs configurable via na inventory variable.