From d602162ece6bf756e9cba13247c9b6ec5658c18f Mon Sep 17 00:00:00 2001 From: Xicheng Chang Date: Fri, 20 Mar 2015 11:46:24 -0700 Subject: [PATCH] Fix two bugs 1. wrong file path for fix_ks_server.py 2. dhcp-relay doesn't need to bind to an interface Change-Id: I2f72fcacd9672d99a035abc6e9f9924f7d7d77f7 --- install/roles/cobbler/files/Dockerfile | 2 +- install/roles/cobbler/tasks/dhcp-relay-debian.yml | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/install/roles/cobbler/files/Dockerfile b/install/roles/cobbler/files/Dockerfile index df58829..eb07e00 100644 --- a/install/roles/cobbler/files/Dockerfile +++ b/install/roles/cobbler/files/Dockerfile @@ -4,7 +4,7 @@ ADD files/dhcp.template /etc/cobbler/dhcp.template ADD files/start.sh /root/start.sh ADD files/admin.pem /etc/cobbler/admin.pem ADD files/chef-validator.pem /etc/cobbler/chef-validator.pem -ADD files/fix_ks_server.py /var/lib/cobbler/sync/post/fix_ks_server.py +ADD files/fix_ks_server.py /var/lib/cobbler/triggers/sync/post/fix_ks_server.py RUN chmod +x /root/start.sh CMD ["/root/start.sh"] diff --git a/install/roles/cobbler/tasks/dhcp-relay-debian.yml b/install/roles/cobbler/tasks/dhcp-relay-debian.yml index 48aadbf..6467a91 100644 --- a/install/roles/cobbler/tasks/dhcp-relay-debian.yml +++ b/install/roles/cobbler/tasks/dhcp-relay-debian.yml @@ -7,10 +7,5 @@ lineinfile: dest=/etc/default/isc-dhcp-relay regexp='^SERVERS' line='SERVERS="{{ cobbler_docker_ip }}"' - -- name: make dhcp-relay agetn listen on compass0 - lineinfile: dest=/etc/default/isc-dhcp-relay - regexp='^INTERFACES' - line='INTERFACES="compass0"' notify: restart dhcp-relay