x
/
compass-install
Code Issues Proposed changes

make 1404 work 

Change-Id: I177849e4d71c79d806366511e03799586a25a009
This commit is contained in:
Xicheng Chang 2015-03-26 00:31:30 -07:00
parent 56dd20bbbe
commit 670c90c2b8
9 changed files with 41 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docker/build/cobbler/Dockerfile
View File

@ -105,9 +105,11 @@ RUN rm -rf /var/lib/cobbler/repo_mirror/ubuntu_ppa_repo && \
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
ADD conf/1404_distributions /tmp/1404_distributions
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 && \
mv /tmp/1404_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

8
docker/build/cobbler/conf/1404_distributions Normal file
View File

@ -0,0 +1,8 @@
Origin: ppa
Label: ppa_repo
Suite: stable
Codename: ppa
Version: 0.1
Architectures: i386 amd64 source
Components: main
Description: ppa repo

4
docker/build/cobbler/conf/cobbler.settings
View File

@ -154,7 +154,7 @@ func_master: overlord.example.org
# change this port if Apache is not running plaintext on port
# 80. Most people can leave this alone.
http_port: 8080
http_port: 80
# kernel options that should be present in every cobbler installation.
# kernel options can also be applied at the distro/profile/system
@ -235,7 +235,7 @@ remove_old_puppet_certs_automatically: 0
# set to 1 to enable Cobbler's DHCP management features.
# the choice of DHCP management engine is in /etc/cobbler/modules.conf
manage_dhcp: 0
manage_dhcp: 1
# set to 1 to enable Cobbler's DNS management features.
# the choice of DNS mangement engine is in /etc/cobbler/modules.conf

16
docker/build/cobbler/conf/setup.conf
View File

@ -1,11 +1,11 @@
#centos6.5
NTP=http://mirror.centos.org/centos/6.5/os/x86_64/Packages/ntp-4.2.6p5-1.el6.centos.x86_64.rpm
SSH_CLIENTS=http://mirror.centos.org/centos/6.5/os/x86_64/Packages/openssh-clients-5.3p1-94.el6.x86_64.rpm
OPENSSH=http://mirror.centos.org/centos/6.5/os/x86_64/Packages/openssh-5.3p1-94.el6.x86_64.rpm
IPROUTE=http://mirror.centos.org/centos/6.5/os/x86_64/Packages/iproute-2.6.32-31.el6.x86_64.rpm
WGET=http://mirror.centos.org/centos/6.5/os/x86_64/Packages/wget-1.12-1.8.el6.x86_64.rpm
NTPDATE=http://mirror.centos.org/centos/6.5/os/x86_64/Packages/ntpdate-4.2.6p5-1.el6.centos.x86_64.rpm
YUM_PRIORITIES=http://mirror.centos.org/centos/6.5/os/x86_64/Packages/yum-plugin-priorities-1.1.30-14.el6.noarch.rpm
NTP=http://mirror.centos.org/centos/6.6/os/x86_64/Packages/ntp-4.2.6p5-1.el6.centos.x86_64.rpm
SSH_CLIENTS=ftp://mirror.switch.ch/pool/4/mirror/scientificlinux/6.5/x86_64/os/Packages/openssh-clients-5.3p1-94.el6.x86_64.rpm
OPENSSH=ftp://mirror.switch.ch/pool/4/mirror/scientificlinux/6.3/x86_64/updates/security/openssh-5.3p1-94.el6.x86_64.rpm
IPROUTE=ftp://mirror.switch.ch/pool/4/mirror/scientificlinux/6.5/x86_64/os/Packages/iproute-2.6.32-31.el6.x86_64.rpm
WGET=ftp://mirror.switch.ch/pool/4/mirror/scientificlinux/6.5/x86_64/os/Packages/wget-1.12-1.8.el6.x86_64.rpm
NTPDATE=http://mirror.centos.org/centos/6.6/os/x86_64/Packages/ntpdate-4.2.6p5-1.el6.centos.x86_64.rpm
YUM_PRIORITIES=ftp://mirror.switch.ch/pool/4/mirror/scientificlinux/6.3/i386/os/Packages/yum-plugin-priorities-1.1.30-14.el6.noarch.rpm
JSONC=http://rpms.adiscon.com/v7-stable/epel-6/x86_64/RPMS/json-c-0.9-4.el6.x86_64.rpm
LIBESTR=http://rpms.adiscon.com/v7-stable/epel-6/x86_64/RPMS/libestr-0.1.9-1.el6.x86_64.rpm
LIBGT=http://rpms.adiscon.com/v7-stable/epel-6/x86_64/RPMS/libgt-0.3.11-1.el6.x86_64.rpm
@ -17,7 +17,7 @@ CHEF_CLIENT_CENTOS=http://opscode-omnibus-packages.s3.amazonaws.com/el/6/x86_64/
CHEF_CLIENT_UBUNTU=http://opscode-omnibus-packages.s3.amazonaws.com/ubuntu/12.04/x86_64/chef_11.8.0-1.ubuntu.12.04_amd64.deb
#iso
CENTOS_ISO=http://mirror.rackspace.com/centos/6.5/isos/x86_64/CentOS-6.5-x86_64-minimal.iso
CENTOS_ISO=https://s3-us-west-1.amazonaws.com/compass-local-repo/centos/6.5/CentOS-6.5-x86_64.iso
UBUNTU_ISO=http://releases.ubuntu.com/12.04/ubuntu-12.04.4-server-amd64.iso
#repos

22
install/group_vars/all
View File

@ -4,9 +4,9 @@
rebuild: True
# Auto-generated IP values
chef_server: "10.145.81.208"
cobbler_server: "10.1.0.11"
compass-server: "10.1.0.11"
chef_server: "10.145.89.139"
cobbler_server: "10.145.89.139"
compass-server: "10.145.89.139"
# Auto-generated
dockerized_cobbler: True
@ -28,31 +28,31 @@ compass_adapters: "git://git.openstack.org/stackforge/compass-adapters.git"
## cobbler
# cidr for docker bridge: compass0
compass0_subnet: "192.168.101.1/24"
compass0_subnet: "192.168.100.1/24"
# subnet ip for docker bridge: compass0
compass0_subnet_ip: "192.168.101.0"
compass0_subnet_ip: "192.168.100.0"
# subnet mask for docker bridge: compass0
compass0_subnet_mask: "255.255.255.0"
# router ip for docker bridge: compass0
compass0_router: "192.168.101.1"
compass0_router: "192.168.100.1"
# dhcp range for docker bridge: compass0
compass0_dhcp_range: "192.168.101.150 192.168.101.160"
compass0_dhcp_range: "192.168.100.150 192.168.100.160"
# management subnet ip of the cluster you want to deploy
mgmt_subnet_ip: "10.1.0.0"
mgmt_subnet_ip: "10.145.88.0"
# management subnet router ip
mgmt_router: "10.1.0.1"
mgmt_router: "10.145.88.1"
# management subnet subnet mask
mgmt_subnet_mask: "255.255.255.0"
mgmt_subnet_mask: "255.255.254.0"
# management subnet dhcp range
mgmt_dhcp_range: "10.1.0.50 10.1.0.100"
mgmt_dhcp_range: "10.145.88.10 10.145.89.150"

2
install/inventories/cobbler
View File

@ -1,2 +1,2 @@
[cobblernodes]
xc-ansible-test1 ansible_ssh_host=10.145.89.128 ansible_ssh_user=root ansible_ssh_pass=root dockerized=True container_name=cobbler-dev type=cobbler
docker-base ansible_ssh_host=10.145.89.139 ansible_ssh_user=root ansible_ssh_pass=root dockerized=True container_name=cobbler-dev type=cobbler

2
install/roles/cobbler/tasks/docker.yml
View File

@ -25,7 +25,7 @@
with_items:
- "{{ centos }}"
- "{{ ubuntu }}"
- "{{ ubuntu_1404 }}
- "{{ ubuntu_1404 }}"
- name: download images
get_url: url={{ item.name }} dest=/tmp/{{ item.filename }} mode=0644

1
install/roles/cobbler/templates/Dockerfile.j2
View File

@ -19,4 +19,3 @@ EXPOSE 53 53/udp
EXPOSE 25151
EXPOSE 443
EXPOSE 873

8
install/roles/cobbler/templates/start.sh.j2
View File

@ -5,7 +5,8 @@ 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
sed -i "s/http_server/server/g" /var/lib/cobbler/snippets/preseed_apt_repo_config
sed -i "/^manage_dhcp/c\manage_dhcp: 1" /etc/cobbler/settings
service httpd restart
service cobblerd restart
@ -25,4 +26,9 @@ cobbler sync
cobbler check
service xinetd restart
if [ ! -e /root/.ssh/id_rsa.pub ]; then
rm -rf /root/.ssh/id_rsa
ssh-keygen -t rsa -f /root/.ssh/id_rsa -q -N ''
fi
tail -f /var/log/cobbler/cobbler.log