vbatts/cri-o
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Playbooks: don't assume the default network is eth0

Browse source 
Replace instances of "ansible_eth0.ipv4.address" with
"ansible_default_ipv4.address" in the integration test playbook, so that
we can run tests without depending on the name of the primary network
interface being "eth0".

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
This commit is contained in:
Nalin Dahyabhai 2017-12-04 10:43:07 -05:00
parent 893aa4e8c7
commit 492f758176
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
contrib/test/integration/build/kubernetes.yml
View file

@ -43,9 +43,9 @@
export CONTAINER_RUNTIME_ENDPOINT='{{ crio_socket }} --runtime-request-timeout=5m' export CONTAINER_RUNTIME_ENDPOINT='{{ crio_socket }} --runtime-request-timeout=5m'
export ALLOW_SECURITY_CONTEXT="," export ALLOW_SECURITY_CONTEXT=","
export ALLOW_PRIVILEGED=1 export ALLOW_PRIVILEGED=1
export DNS_SERVER_IP={{ ansible_eth0.ipv4.address }} export DNS_SERVER_IP={{ ansible_default_ipv4.address }}
export API_HOST={{ ansible_eth0.ipv4.address }} export API_HOST={{ ansible_default_ipv4.address }}
export API_HOST_IP={{ ansible_eth0.ipv4.address }} export API_HOST_IP={{ ansible_default_ipv4.address }}
export KUBE_ENABLE_CLUSTER_DNS=true export KUBE_ENABLE_CLUSTER_DNS=true
./hack/local-up-cluster.sh ./hack/local-up-cluster.sh
mode: "u=rwx,g=rwx,o=x" mode: "u=rwx,g=rwx,o=x"

2
contrib/test/integration/e2e.yml
View file

@ -10,7 +10,7 @@
- name: update the server address for the custom cluster - name: update the server address for the custom cluster
lineinfile: lineinfile:
dest: /usr/local/bin/createcluster.sh dest: /usr/local/bin/createcluster.sh
line: "export {{ item }}={{ ansible_eth0.ipv4.address }}" line: "export {{ item }}={{ ansible_default_ipv4.address }}"
regexp: "^export {{ item }}=" regexp: "^export {{ item }}="
state: present state: present
with_items: with_items: