use aliyun

bootstrap

@@ -75,6 +75,8 @@ def main():
     parser.add_option('--ipip', action='store_true',
                       help="calico using ip tunnel")
     parser.add_option('--pypi-mirror',action='store_true',help='use the third party python mirror')
+    parser.add_option('--os', choices=('CentOS', 'Ubuntu'), default='CentOS',
+                      help="The operating system of the node")
     options, args = parser.parse_args()
 
     if options.download_only:
@@ -139,7 +141,7 @@ def bootstrap(options):
 
 def exec_prepare(options):
     os.chdir(here)
-    check_call(['bash', 'prepare.sh'])
+    check_call(['bash', 'prepare.sh', options.os])
 
 def install_ansible(options):
     if not which('ansible-playbook'):

playbooks/roles/docker/meta/main.yaml

@@ -6,3 +6,4 @@ dependencies:
   - role: etcd
   - role: binary
   - role: firewall
+  - role: networkd

playbooks/roles/etcd/tasks/main.yaml

@@ -45,6 +45,7 @@
     wanted_members: "{{ wanted_member_list.stdout_lines }}"
     is_lain_manager: "{{ is_lain_manager }}"
     node_name: "{{node_name}}"
+  ignore_errors: yes
 
 # begin to reset etcd
 - include: etcd-reset.yaml

playbooks/roles/networkd/meta/main.yaml

@@ -1,2 +1,3 @@
 dependencies:
-  - role: config
+  - role: config
+  - role: lainlet

prepare.sh

@@ -1,5 +1,7 @@
 #!/bin/sh
 
+# $1: Operating system of the node, `CentOS` or `Ubuntu`
+
 set -e
 
 NETWORKD_VERSION="v2.4.0"
@@ -16,6 +18,7 @@ BIRD6_VERSION="v0.3.1"
 CONSUL_VERSION="0.8.5"
 ETCD_VERSION="2.3.7"
 BINARY_URL_PREFIX="https://lain.oss-cn-beijing.aliyuncs.com/binary"
+# BINARY_URL_PREFIX="https://github.com"
 
 filename="lain-pre-1476939656.tar.gz"
 if [ ! -f "$filename" ]; then
@@ -32,23 +35,24 @@ mkdir -p playbooks/roles/calico/files/bin
 mkdir -p playbooks/roles/consul/files/bin
 mkdir -p playbooks/roles/docker-netstat/files/bin
 
-wget  ${BINARY_URL_PREFIX}/networkd/releases/download/${NETWORKD_VERSION}/networkd.xz -O playbooks/roles/networkd/files/networkd.xz
-wget  ${BINARY_URL_PREFIX}/deployd/releases/download/${DEPLOYD_VERSION}/deployd.xz -O playbooks/roles/deployd/files/deployd.xz
-wget  ${BINARY_URL_PREFIX}/lainlet/releases/download/${LAINLET_VERSION}/lainlet.xz -O playbooks/roles/lainlet/files/lainlet.xz
-wget  ${BINARY_URL_PREFIX}/calicoctl/releases/download/${CALICOCTL_VERSION}/calicoctl.xz -O playbooks/roles/calico/files/bin/calicoctl.xz
-wget  ${BINARY_URL_PREFIX}/calicoctl/releases/download/${ALLOCATE_IPIP_ADDR_VERSION}/allocate-ipip-addr.xz -O playbooks/roles/calico/files/bin/allocate-ipip-addr.xz
-wget  ${BINARY_URL_PREFIX}/calicoctl/releases/download/${STARTUP_VERSION}/startup.xz -O playbooks/roles/calico/files/bin/startup.xz
-wget  ${BINARY_URL_PREFIX}/felix/releases/download/${CALICO_FELIX_VERSION}/calico-felix.xz -O playbooks/roles/calico/files/bin/calico-felix.xz
-wget  ${BINARY_URL_PREFIX}/confd/releases/download/${CONFD_VERSION}/confd.xz -O playbooks/roles/calico/files/bin/confd.xz
-wget  ${BINARY_URL_PREFIX}/libnetwork-plugin/releases/download/${LIBNETWORK_PLUGIN_VERSION}/libnetwork-plugin.xz -O playbooks/roles/calico/files/bin/libnetwork-plugin.xz
-wget  ${BINARY_URL_PREFIX}/bird/releases/download/${BIRD_VERSION}/bird.xz -O playbooks/roles/calico/files/bin/bird.xz
-wget  ${BINARY_URL_PREFIX}/bird/releases/download/${BIRD6_VERSION}/bird6.xz -O playbooks/roles/calico/files/bin/bird6.xz
-wget  ${BINARY_URL_PREFIX}/consul/${CONSUL_VERSION}/consul_${CONSUL_VERSION}_linux_amd64.zip -O playbooks/roles/consul/files/bin/consul_${CONSUL_VERSION}_linux_amd64.zip
-wget https://github.com/coreos/etcd/releases/download/v${ETCD_VERSION}/etcd-v${ETCD_VERSION}-linux-amd64.tar.gz -O - | tar xz -C /tmp
-wget https://download.docker.com/linux/ubuntu/dists/trusty/pool/stable/amd64/docker-ce_17.09.1~ce-0~ubuntu_amd64.deb -O  playbooks/roles/binary/files/lain/docker-ce_17.09.1_ubuntu_14.04_amd64.deb
-wget https://download.docker.com/linux/ubuntu/dists/xenial/pool/stable/amd64/docker-ce_17.09.1~ce-0~ubuntu_amd64.deb -O  playbooks/roles/binary/files/lain/docker-ce_17.09.1_ubuntu_16.04_amd64.deb
-
-wget -c https://github.com/laincloud/docker-netstat/releases/download/v1.2/docker-netstat -O playbooks/roles/docker-netstat/files/bin/docker-netstat
+wget ${BINARY_URL_PREFIX}/networkd/releases/download/${NETWORKD_VERSION}/networkd.xz -O playbooks/roles/networkd/files/networkd.xz
+wget ${BINARY_URL_PREFIX}/deployd/releases/download/${DEPLOYD_VERSION}/deployd.xz -O playbooks/roles/deployd/files/deployd.xz
+wget ${BINARY_URL_PREFIX}/lainlet/releases/download/${LAINLET_VERSION}/lainlet.xz -O playbooks/roles/lainlet/files/lainlet.xz
+wget ${BINARY_URL_PREFIX}/calicoctl/releases/download/${CALICOCTL_VERSION}/calicoctl.xz -O playbooks/roles/calico/files/bin/calicoctl.xz
+wget ${BINARY_URL_PREFIX}/calicoctl/releases/download/${ALLOCATE_IPIP_ADDR_VERSION}/allocate-ipip-addr.xz -O playbooks/roles/calico/files/bin/allocate-ipip-addr.xz
+wget ${BINARY_URL_PREFIX}/calicoctl/releases/download/${STARTUP_VERSION}/startup.xz -O playbooks/roles/calico/files/bin/startup.xz
+wget ${BINARY_URL_PREFIX}/felix/releases/download/${CALICO_FELIX_VERSION}/calico-felix.xz -O playbooks/roles/calico/files/bin/calico-felix.xz
+wget ${BINARY_URL_PREFIX}/confd/releases/download/${CONFD_VERSION}/confd.xz -O playbooks/roles/calico/files/bin/confd.xz
+wget ${BINARY_URL_PREFIX}/libnetwork-plugin/releases/download/${LIBNETWORK_PLUGIN_VERSION}/libnetwork-plugin.xz -O playbooks/roles/calico/files/bin/libnetwork-plugin.xz
+wget ${BINARY_URL_PREFIX}/bird/releases/download/${BIRD_VERSION}/bird.xz -O playbooks/roles/calico/files/bin/bird.xz
+wget ${BINARY_URL_PREFIX}/bird/releases/download/${BIRD6_VERSION}/bird6.xz -O playbooks/roles/calico/files/bin/bird6.xz
+wget ${BINARY_URL_PREFIX}/consul/${CONSUL_VERSION}/consul_${CONSUL_VERSION}_linux_amd64.zip -O playbooks/roles/consul/files/bin/consul_${CONSUL_VERSION}_linux_amd64.zip
+wget ${BINARY_URL_PREFIX}/laincloud/docker-netstat/releases/download/v1.2/docker-netstat -O playbooks/roles/docker-netstat/files/bin/docker-netstat
+wget ${BINARY_URL_PREFIX}/coreos/etcd/releases/download/v${ETCD_VERSION}/etcd-v${ETCD_VERSION}-linux-amd64.tar.gz -O - | tar xz -C /tmp
+if [ "$1" == "Ubuntu" ]; then
+    wget https://download.docker.com/linux/ubuntu/dists/trusty/pool/stable/amd64/docker-ce_17.09.1~ce-0~ubuntu_amd64.deb -O  playbooks/roles/binary/files/lain/docker-ce_17.09.1_ubuntu_14.04_amd64.deb
+    wget https://download.docker.com/linux/ubuntu/dists/xenial/pool/stable/amd64/docker-ce_17.09.1~ce-0~ubuntu_amd64.deb -O  playbooks/roles/binary/files/lain/docker-ce_17.09.1_ubuntu_16.04_amd64.deb
+fi
 
 unxz -kf playbooks/roles/networkd/files/networkd.xz
 unxz -kf playbooks/roles/deployd/files/deployd.xz