diff --git a/docker/build/cobbler/Dockerfile b/docker/build/cobbler/Dockerfile index 8136086..ce0211d 100644 --- a/docker/build/cobbler/Dockerfile +++ b/docker/build/cobbler/Dockerfile @@ -103,19 +103,27 @@ RUN rm -rf /var/lib/cobbler/repo_mirror/ubuntu_ppa_repo && \ mkdir -p /var/lib/cobbler/repo_mirror/ubuntu_ppa_repo/conf && \ mv /tmp/distributions /var/lib/cobbler/repo_mirror/ubuntu_ppa_repo/conf/distributions && \ chmod 644 /var/lib/cobbler/repo_mirror/ubuntu_ppa_repo/conf/distributions && \ - wget -O /var/lib/cobbler/repo_mirror/ubuntu_ppa_repo/chef_11.8.0-1.ubuntu.12.04_amd64.deb http://opscode-omnibus-packages.s3.amazonaws.com/ubuntu/12.04/x86_64/chef_11.8.0-1.ubuntu.12.04_amd64.deb + wget -O /var/lib/cobbler/repo_mirror/ubuntu_ppa_repo/chef_11.8.0-1.ubuntu.12.04_amd64.deb http://opscode-omnibus-packages.s3.amazonaws.com/ubuntu/12.04/x86_64/chef_11.8.0-1.ubuntu.12.04_amd64.deb + +RUN rm -rf /var/lib/cobbler/repo_mirror/ubuntu_14_04_ppa_repo && \ + mkdir -p /var/lib/cobbler/repo_mirror/ubuntu_14_04_ppa_repo/conf && \ + mv /tmp/distributions /var/lib/cobbler/repo_mirror/ubuntu_14_04_ppa_repo/conf/distributions && \ + chmod 644 /var/lib/cobbler/repo_mirror/ubuntu_14_04_ppa_repo/conf/distributions && \ + wget -O /var/lib/cobbler/repo_mirror/ubuntu_14_04_ppa_repo/chef_12.1.1-1_amd64.deb https://opscode-omnibus-packages.s3.amazonaws.com/ubuntu/13.04/x86_64/chef_12.1.1-1_amd64.deb # create repos WORKDIR /var/lib/cobbler/repo_mirror RUN createrepo centos_ppa_repo && \ - find ubuntu_ppa_repo -name \*.deb -exec reprepro -Vb ubuntu_ppa_repo includedeb ppa {} \; + find ubuntu_ppa_repo -name \*.deb -exec reprepro -Vb ubuntu_ppa_repo includedeb ppa {} \; && \ + find ubuntu_14_04_ppa_repo -name \*.deb -exec reprepro -Vb ubuntu_14_04_ppa_repo includedeb ppa {} \; # add repos to cobbler repo and get loaders RUN /usr/sbin/apachectl -k start && \ /usr/bin/cobblerd start \& && \ cobbler repo add --mirror=/var/lib/cobbler/repo_mirror/centos_ppa_repo --name=centos_ppa_repo --mirror-locally=Y --arch=x86_64 && \ cobbler repo add --mirror=/var/lib/cobbler/repo_mirror/ubuntu_ppa_repo --name=ubuntu_ppa_repo --mirror-locally=Y --arch=x86_64 && \ + cobbler repo add --mirror=/var/lib/cobbler/repo_mirror/ubuntu_14_04_ppa_repo --name=ubuntu_14_04_ppa_repo --mirror-locally=Y --arch=x86_64 && \ cobbler reposync && \ cobbler get-loaders diff --git a/install/group_vars/all b/install/group_vars/all index a34c944..faf20d1 100644 --- a/install/group_vars/all +++ b/install/group_vars/all @@ -121,6 +121,12 @@ centos_65: "CentOS-6.5-x86_64" # ubuntu 12.04 os name ubuntu_1204: "Ubuntu-12.04-x86_64" +# ubuntu 14.04 url +ubuntu_1404_url: "https://s3-us-west-1.amazonaws.com/compass-local-repo/ubuntu/14.04/Ubuntu-14.04-x86_64.iso" + +# ubuntu 14.04 os name +ubuntu_1404: "Ubuntu-14.04-x86_64" + ## volume mapping for cobbler ## diff --git a/install/roles/cobbler/tasks/docker.yml b/install/roles/cobbler/tasks/docker.yml index 8e9ca62..477e64e 100644 --- a/install/roles/cobbler/tasks/docker.yml +++ b/install/roles/cobbler/tasks/docker.yml @@ -25,12 +25,14 @@ with_items: - "{{ centos }}" - "{{ ubuntu }}" + - "{{ ubuntu_1404 }} - name: download images get_url: url={{ item.name }} dest=/tmp/{{ item.filename }} mode=0644 with_items: - { name: "{{ centos_url }}", filename: "{{ centos }}.iso" } - { name: "{{ ubuntu_url }}", filename: "{{ ubuntu }}.iso" } + - { name: "{{ ubuntu_1404_url }}", filename: "{{ ubuntu_1404 }}.iso" } - name: mount info command: mount @@ -42,6 +44,7 @@ with_items: - "{{ centos }}" - "{{ ubuntu }}" + - "{{ ubuntu_1404 }}" when: mount_info.stdout.find('CentOS') == -1 - name: copy Dockerfile to ~/docker-cobbler diff --git a/install/roles/cobbler/templates/start.sh.j2 b/install/roles/cobbler/templates/start.sh.j2 index f720699..f637e32 100644 --- a/install/roles/cobbler/templates/start.sh.j2 +++ b/install/roles/cobbler/templates/start.sh.j2 @@ -5,6 +5,7 @@ sed -i "/^local-address/c\local-address $ipaddr;" /etc/cobbler/dhcp.template sed -i "s/listen-on port 53 { \$listen_ip; }/listen-on port 53 \{ $ipaddr; \}/g" /etc/cobbler/named.template sed -i "/^server/c\server: $ipaddr" /etc/cobbler/settings sed -i "/^next_server/c\next_server: {{ cobbler_server }}" /etc/cobbler/settings +sed -i "s/http_server/server/g' /var/lib/cobbler/snippets/preseed_apt_repo_config service httpd restart service cobblerd restart @@ -12,10 +13,12 @@ service cobblerd restart # import distros cobbler import --path=/var/lib/cobbler/mount_point/CentOS-6.5-x86_64 --name=CentOS-6.5-x86_64 --arch=x86_64 --kickstart=/var/lib/cobbler/kickstarts/default.ks --breed=redhat cobbler import --path=/var/lib/cobbler/mount_point/Ubuntu-12.04-x86_64 --name=Ubuntu-12.04-x86_64 --arch=x86_64 --kickstart=/var/lib/cobbler/kickstarts/default.seed --breed=ubuntu +cobbler import --path=/var/lib/cobbler/mount_point/Ubuntu-14.04-x86_64 --name=Ubuntu-14.04-x86_64 --arch=x86_64 --kickstart=/var/lib/cobbler/kickstarts/default.seed --breed=ubuntu # add profiles cobbler profile edit --name=CentOS-6.5-x86_64 --repo=centos_ppa_repo --distro=CentOS-6.5-x86_64 --ksmeta="tree=http://{{ cobbler_server }}:{{ cobbler_mapped_http_port_on_host }}/cobbler/ks_mirror/CentOS-6.5-x86_64 http_port={{ cobbler_mapped_http_port_on_host }} cblr_server={{ cobbler_server }} rsyslog_port={{ rsyslog_port_mapped_on_host }} chef_validation_file=/etc/cobbler/chef-validator.pem chef_admin_file=/etc/cobbler/admin.pem" --kickstart=/var/lib/cobbler/kickstarts/default.ks cobbler profile edit --name=Ubuntu-12.04-x86_64 --repo=ubuntu_ppa_repo --distro=Ubuntu-12.04-x86_64 --ksmeta="tree=http://{{ cobbler_server }}:{{ cobbler_mapped_http_port_on_host }}/cobbler/ks_mirror/Ubuntu-12.04-x86_64 http_port={{ cobbler_mapped_http_port_on_host }} cblr_server={{ cobbler_server }} rsyslog_port={{ rsyslog_port_mapped_on_host }} chef_validation_file=/etc/cobbler/chef-validator.pem chef_admin_file=/etc/cobbler/admin.pem" --kickstart=/var/lib/cobbler/kickstarts/default.seed --kopts="netcfg/choose_interface=auto" +cobbler profile edit --name=Ubuntu-14.04-x86_64 --repo=ubuntu_14_04_ppa_repo --distro=Ubuntu-14.04-x86_64 --ksmeta="tree=http://{{ cobbler_server }}:{{ cobbler_mapped_http_port_on_host }}/cobbler/ks_mirror/Ubuntu-14.04-x86_64 http_port={{ cobbler_mapped_http_port_on_host }} cblr_server={{ cobbler_server }} rsyslog_port={{ rsyslog_port_mapped_on_host }} chef_validation_file=/etc/cobbler/chef-validator.pem chef_admin_file=/etc/cobbler/admin.pem" --kickstart=/var/lib/cobbler/kickstarts/default.seed --kopts="netcfg/choose_interface=auto" cobbler sync