Merge branch 'release/4.1.0'

hswong3i · hswong3i · commit 9e92dc667c7a · 2020-01-16T14:17:27.000+08:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,9 +1,18 @@
 # AlviStack-Ansible
 
-## 4.1.0 - TBC
+## 4.2.0 - TBC
 
 ### Major Changes
 
+## 4.1.0 - 2020-01-15
+
+### Major Changes
+
+  - Avoid EPEL Repo and IUS Repo for CentOS/RHEL 7
+  - Handle controller setup with `ansible-install.yml`
+  - Copy keys for controller by `ceph-install.yml` and `kubernetes-install.yml`
+  - Replace default `cephfs-provisioner` with `csi-cephfs`
+
 ## 4.0.0 - 2019-11-05
 
   - Initial release for Ansible 2.9 or higher
diff --git a/ansible.cfg b/ansible.cfg
@@ -7,6 +7,6 @@ scp_if_ssh = true
 ansible_managed = Ansible managed: Do NOT edit this file manually!
 forks = 10
 host_key_checking = false
-interpreter_python = auto
+interpreter_python = python3
 nocows = 1
 retry_files_enabled = false
diff --git a/molecule/centos-7/prepare.yml b/molecule/centos-7/prepare.yml
@@ -28,18 +28,18 @@
           --autosubscribe
       ignore_errors: true
 
-    - name: redhat | yum install ca-certificates curl python3 sudo
+    - name: redhat | yum install -y ca-certificates curl python3 sudo
       raw: |
         yum install -y ca-certificates curl python3 sudo
       ignore_errors: true
 
-    - name: suse | zypper install ca-certificates* curl python3 python3-xml sudo
+    - name: suse | zypper -n install -y ca-certificates curl python3 sudo
       raw: |
         zypper -n --gpg-auto-import-keys refresh
-        zypper -n install -y ca-certificates* curl python3 python3-xml sudo
+        zypper -n install -y ca-certificates curl python3 sudo
       ignore_errors: true
 
-    - name: debian | apt-get install ca-certificates curl python3 sudo
+    - name: debian | apt-get install -y ca-certificates curl python3 sudo
       raw: |
         apt-get update
         apt-get install -y ca-certificates curl python3 sudo
diff --git a/molecule/redhat-7-vagrant/prepare.yml b/molecule/redhat-7-vagrant/prepare.yml
@@ -28,18 +28,18 @@
           --autosubscribe
       ignore_errors: true
 
-    - name: redhat | yum install ca-certificates curl python3 sudo
+    - name: redhat | yum install -y ca-certificates curl python3 sudo
       raw: |
         yum install -y ca-certificates curl python3 sudo
       ignore_errors: true
 
-    - name: suse | zypper install ca-certificates* curl python3 python3-xml sudo
+    - name: suse | zypper -n install -y ca-certificates curl python3 sudo
       raw: |
         zypper -n --gpg-auto-import-keys refresh
-        zypper -n install -y ca-certificates* curl python3 python3-xml sudo
+        zypper -n install -y ca-certificates curl python3 sudo
       ignore_errors: true
 
-    - name: debian | apt-get install ca-certificates curl python3 sudo
+    - name: debian | apt-get install -y ca-certificates curl python3 sudo
       raw: |
         apt-get update
         apt-get install -y ca-certificates curl python3 sudo
diff --git a/molecule/suse-15/prepare.yml b/molecule/suse-15/prepare.yml
@@ -28,18 +28,18 @@
           --autosubscribe
       ignore_errors: true
 
-    - name: redhat | yum install ca-certificates curl python3 sudo
+    - name: redhat | yum install -y ca-certificates curl python3 sudo
       raw: |
         yum install -y ca-certificates curl python3 sudo
       ignore_errors: true
 
-    - name: suse | zypper install ca-certificates* curl python3 python3-xml sudo
+    - name: suse | zypper -n install -y ca-certificates curl python3 sudo
       raw: |
         zypper -n --gpg-auto-import-keys refresh
-        zypper -n install -y ca-certificates* curl python3 python3-xml sudo
+        zypper -n install -y ca-certificates curl python3 sudo
       ignore_errors: true
 
-    - name: debian | apt-get install ca-certificates curl python3 sudo
+    - name: debian | apt-get install -y ca-certificates curl python3 sudo
       raw: |
         apt-get update
         apt-get install -y ca-certificates curl python3 sudo
diff --git a/molecule/ubuntu-16.04/prepare.yml b/molecule/ubuntu-16.04/prepare.yml
@@ -28,18 +28,18 @@
           --autosubscribe
       ignore_errors: true
 
-    - name: redhat | yum install ca-certificates curl python3 sudo
+    - name: redhat | yum install -y ca-certificates curl python3 sudo
       raw: |
         yum install -y ca-certificates curl python3 sudo
       ignore_errors: true
 
-    - name: suse | zypper install ca-certificates* curl python3 python3-xml sudo
+    - name: suse | zypper -n install -y ca-certificates curl python3 sudo
       raw: |
         zypper -n --gpg-auto-import-keys refresh
-        zypper -n install -y ca-certificates* curl python3 python3-xml sudo
+        zypper -n install -y ca-certificates curl python3 sudo
       ignore_errors: true
 
-    - name: debian | apt-get install ca-certificates curl python3 sudo
+    - name: debian | apt-get install -y ca-certificates curl python3 sudo
       raw: |
         apt-get update
         apt-get install -y ca-certificates curl python3 sudo
diff --git a/molecule/ubuntu-18.04-vagrant/prepare.yml b/molecule/ubuntu-18.04-vagrant/prepare.yml
@@ -28,18 +28,18 @@
           --autosubscribe
       ignore_errors: true
 
-    - name: redhat | yum install ca-certificates curl python3 sudo
+    - name: redhat | yum install -y ca-certificates curl python3 sudo
       raw: |
         yum install -y ca-certificates curl python3 sudo
       ignore_errors: true
 
-    - name: suse | zypper install ca-certificates* curl python3 python3-xml sudo
+    - name: suse | zypper -n install -y ca-certificates curl python3 sudo
       raw: |
         zypper -n --gpg-auto-import-keys refresh
-        zypper -n install -y ca-certificates* curl python3 python3-xml sudo
+        zypper -n install -y ca-certificates curl python3 sudo
       ignore_errors: true
 
-    - name: debian | apt-get install ca-certificates curl python3 sudo
+    - name: debian | apt-get install -y ca-certificates curl python3 sudo
       raw: |
         apt-get update
         apt-get install -y ca-certificates curl python3 sudo
diff --git a/molecule/ubuntu-18.04/prepare.yml b/molecule/ubuntu-18.04/prepare.yml
@@ -28,18 +28,18 @@
           --autosubscribe
       ignore_errors: true
 
-    - name: redhat | yum install ca-certificates curl python3 sudo
+    - name: redhat | yum install -y ca-certificates curl python3 sudo
       raw: |
         yum install -y ca-certificates curl python3 sudo
       ignore_errors: true
 
-    - name: suse | zypper install ca-certificates* curl python3 python3-xml sudo
+    - name: suse | zypper -n install -y ca-certificates curl python3 sudo
       raw: |
         zypper -n --gpg-auto-import-keys refresh
-        zypper -n install -y ca-certificates* curl python3 python3-xml sudo
+        zypper -n install -y ca-certificates curl python3 sudo
       ignore_errors: true
 
-    - name: debian | apt-get install ca-certificates curl python3 sudo
+    - name: debian | apt-get install -y ca-certificates curl python3 sudo
       raw: |
         apt-get update
         apt-get install -y ca-certificates curl python3 sudo
diff --git a/playbooks/roles/ansible b/playbooks/roles/ansible
@@ -1 +1 @@
-Subproject commit a11e42b0be758936adef84d2468fb68ea6deb31b
+Subproject commit 55c7135b27a6e6220d6714c12a261703b2389273
diff --git a/playbooks/roles/bootstrap b/playbooks/roles/bootstrap
@@ -1 +1 @@
-Subproject commit 9698c0ba54165467f79fb0bf9a76245d3ccd8c45
+Subproject commit d5fb7b7e4d070fc5702baa91c6d8d9ca9dd920ad
diff --git a/playbooks/roles/ceph-common b/playbooks/roles/ceph-common
@@ -1 +1 @@
-Subproject commit 038f203379d3d84ab556531d735927b0d45a5654
+Subproject commit 4b7831142a36ebd4d70f167256d4060d959902b9
diff --git a/playbooks/roles/ceph-mds b/playbooks/roles/ceph-mds
@@ -1 +1 @@
-Subproject commit 5255923e4494c15b42e3824e80022286357dcdb9
+Subproject commit 3299156960a2a5bec6533e814475a9a06efaef92
diff --git a/playbooks/roles/ceph-mgr b/playbooks/roles/ceph-mgr
@@ -1 +1 @@
-Subproject commit ea3e80e855b107ebf387f8c71938d0994fb70aa0
+Subproject commit 89e9450e7317f36997edf0d6c11cde3e81b14204
diff --git a/playbooks/roles/ceph-mon b/playbooks/roles/ceph-mon
@@ -1 +1 @@
-Subproject commit 823a8332ca32bcb2af7791e43aa77bc941a7d882
+Subproject commit e88eeefc4146c69d0e477d7f9219ecf0adf87a59
diff --git a/playbooks/roles/ceph-osd b/playbooks/roles/ceph-osd
@@ -1 +1 @@
-Subproject commit a3b0e90ba7a730260d67edb25d2656a6d848fc32
+Subproject commit 1d4fc7ff212cdf912d3699537421bb7a01f85e43
diff --git a/playbooks/roles/ceph-rgw b/playbooks/roles/ceph-rgw
@@ -1 +1 @@
-Subproject commit 1fb2c3c88ac0b6810a03916ba4974f91c0c935ce
+Subproject commit b77210a4d042a2222f6257d5e8298e9a03ac9e03
diff --git a/playbooks/roles/chrony b/playbooks/roles/chrony
@@ -1 +1 @@
-Subproject commit 81b4832a92f56e8dc944480b4d87b11201075d14
+Subproject commit 784fa58ec61f916e55a2eef2cc01bc50221fd9c6
diff --git a/playbooks/roles/cri-tools b/playbooks/roles/cri-tools
@@ -1 +1 @@
-Subproject commit 95ef17d878eb60adfe5e5a0bde5a37e7e5395830
+Subproject commit 61b4c5ca13ee8856783e8dcf792f0ebc47548d45
diff --git a/playbooks/roles/docker b/playbooks/roles/docker
@@ -1 +1 @@
-Subproject commit 216db7b3a21fce2035f104d374179019825f8cdb
+Subproject commit a68ccbc061969b8f8bc0da6047cd9506ed8f9d44
diff --git a/playbooks/roles/duplicity b/playbooks/roles/duplicity
@@ -1 +1 @@
-Subproject commit 3cdd28a54d0ea9fee33b3866a4410ccd349dadef
+Subproject commit 747601ae33f477afb2c15d12975ccfcd611d0635
diff --git a/playbooks/roles/etcd b/playbooks/roles/etcd
@@ -1 +1 @@
-Subproject commit 12fb034d592fbc820d52e32000ba3701a13eb918
+Subproject commit 6267b256024fb08b53c5d97eb809d7583cb4f818
diff --git a/playbooks/roles/git b/playbooks/roles/git
@@ -1 +1 @@
-Subproject commit f54b922378da799aa4c6ea283a87bae9a4b31734
+Subproject commit 802daf1fc44c73b45991f11e575d0eb434b60f85
diff --git a/playbooks/roles/kernel b/playbooks/roles/kernel
@@ -1 +1 @@
-Subproject commit 5273ab2a3386b23ef85d4d3f85a65c808a9d8f3d
+Subproject commit 3310b884dc8d29557e2eb00a914f1f952b942976
diff --git a/playbooks/roles/kubeadm b/playbooks/roles/kubeadm
@@ -1 +1 @@
-Subproject commit c9d0f179c8ce476adab9e034844a7dad8661391a
+Subproject commit 94df8b7eee86f6a2e785e80da013ad9a7944ca51
diff --git a/playbooks/roles/kubectl b/playbooks/roles/kubectl
@@ -1 +1 @@
-Subproject commit 0353fed29e4cab2625c83cfe5243f8f533f17fac
+Subproject commit e185079dce29b7b0a5c0f9c44da2f88cbce1055d
diff --git a/playbooks/roles/kubelet b/playbooks/roles/kubelet
@@ -1 +1 @@
-Subproject commit b02c4d07a37327a50f3a0450b8aedb5457455818
+Subproject commit 9d430ecfdc4088d0a622d2bb1db524e10fdd163b
diff --git a/playbooks/roles/kubernetes b/playbooks/roles/kubernetes
@@ -1 +1 @@
-Subproject commit 34cfd73b0a0b3e200461aa30b69dea72bf98bd0f
+Subproject commit aa5819ba076302a0793214558e473810a37c91cc
diff --git a/playbooks/roles/kubernetes-addon-manager b/playbooks/roles/kubernetes-addon-manager
@@ -1 +1 @@
-Subproject commit 5eed2b21425fcb1955598e218bac836a90b0c146
+Subproject commit f1da23a3bd8fcc4299035b4f525d097e87d03d68
diff --git a/playbooks/roles/kubernetes-cephfs-provisioner b/playbooks/roles/kubernetes-cephfs-provisioner
@@ -1 +1 @@
-Subproject commit 8e9cfdfcd1d6821d9604950028c5a7a9d338b22e
+Subproject commit e0cb5c6addf5166cd380659cd5ed790404bc7c40
diff --git a/playbooks/roles/kubernetes-cert-manager b/playbooks/roles/kubernetes-cert-manager
@@ -1 +1 @@
-Subproject commit 6fd91d299369e21abada74cf8b3671150dc45115
+Subproject commit 02e4b2f7fc552e251d28e3d1b831064a89abc036
diff --git a/playbooks/roles/kubernetes-cni b/playbooks/roles/kubernetes-cni
@@ -1 +1 @@
-Subproject commit 26ca28de4236ac539f1e221b5df70af51112f237
+Subproject commit b225c5f5b20797bdab88aab4fb325ed22f4a5610
diff --git a/playbooks/roles/kubernetes-csi-cephfs b/playbooks/roles/kubernetes-csi-cephfs
@@ -1 +1 @@
-Subproject commit b0fdfcbc156e83fdb7389112f1685c88de0370cd
+Subproject commit c8d757be483576389483cd21c25ab99a63b2f6a1
diff --git a/playbooks/roles/kubernetes-csi-hostpath b/playbooks/roles/kubernetes-csi-hostpath
@@ -1 +1 @@
-Subproject commit c8b8853b25732ef9aec56c731b8b323de6fb7306
+Subproject commit a9283d608ce90ec2007d8c0446ac18adfeb46817
diff --git a/playbooks/roles/kubernetes-csi-rbd b/playbooks/roles/kubernetes-csi-rbd
@@ -1 +1 @@
-Subproject commit 2e24db51b66ae144ed03877a7df0208614a13e91
+Subproject commit b0d4c376ba9bbb7b8c029f03494de46d8bc72820
diff --git a/playbooks/roles/kubernetes-dashboard b/playbooks/roles/kubernetes-dashboard
@@ -1 +1 @@
-Subproject commit 39dd52827beeb9deb41a22eb57158e94b64657f6
+Subproject commit 5fe2e5e99e477e8929e4cd0d6519b2c59f9527f5
diff --git a/playbooks/roles/kubernetes-flannel b/playbooks/roles/kubernetes-flannel
@@ -1 +1 @@
-Subproject commit 3da4627a8244c547b496e05703c8e80a0d2c1d2f
+Subproject commit da1da2d528b3658c384147651ee472a19a32f17f
diff --git a/playbooks/roles/kubernetes-hostpath-provisioner b/playbooks/roles/kubernetes-hostpath-provisioner
@@ -1 +1 @@
-Subproject commit 7fe519ffd7a92187bc9a3eb95edf0684fa044b81
+Subproject commit eaec2cc3ce7f2b9583d1c3f6f232ad72c62d92bc
diff --git a/playbooks/roles/kubernetes-ingress-nginx b/playbooks/roles/kubernetes-ingress-nginx
@@ -1 +1 @@
-Subproject commit 13aaa0b6aee1c5e4422c7bdaa951de4976cada1a
+Subproject commit 617bdc5620673eba6d61c3d09c6b93d2bb99799f
diff --git a/playbooks/roles/kubernetes-metallb b/playbooks/roles/kubernetes-metallb
@@ -1 +1 @@
-Subproject commit d12db18e07ae7502964da17b3820f026a3cf7540
+Subproject commit 1e870423f2a7bddc21bca398578f6648f7e9fbdc
diff --git a/playbooks/roles/kubernetes-rbd-provisioner b/playbooks/roles/kubernetes-rbd-provisioner
@@ -1 +1 @@
-Subproject commit edd656de9ccd0e7b4f421818da23a2cf8f05f787
+Subproject commit 327cc0b43ffe6e6040a15dd73eaa0d632e9127d2
diff --git a/playbooks/roles/kubernetes-registry b/playbooks/roles/kubernetes-registry
@@ -1 +1 @@
-Subproject commit 33dd5399daf8ca8f002495eeadaf94089a90475d
+Subproject commit e7e6223bbcc70f41f6f06ec790019d5257588785
diff --git a/playbooks/roles/kubernetes-weave b/playbooks/roles/kubernetes-weave
@@ -1 +1 @@
-Subproject commit ae3c9e5574d4f5fbc1116b3e6ee8b207b2ee7677
+Subproject commit 9258f2d81621c65d83e34e01a2c462767e37c455
diff --git a/playbooks/roles/locales b/playbooks/roles/locales
@@ -1 +1 @@
-Subproject commit 607966acc67ee7dc103c80bf6473c70134e5ea2e
+Subproject commit 29d27ca421698b267226485371564d92e4ee51e1
diff --git a/playbooks/roles/ntp b/playbooks/roles/ntp
@@ -1 +1 @@
-Subproject commit b51202e6bc9438dd4c63b595e172cb315975985e
+Subproject commit 05518605ffe9680daf932eafbc6be1912d6aa8b5
diff --git a/playbooks/roles/python b/playbooks/roles/python
@@ -1 +1 @@
-Subproject commit c9f1a7059d82d544025900e7c914714c49ee8945
+Subproject commit f0fe1c627da1f022a08b069f9b2ab2891bd99990
diff --git a/playbooks/roles/rclone b/playbooks/roles/rclone
@@ -1 +1 @@
-Subproject commit f73bbef343eacd03176be4c6b5703d467ef4e8cf
+Subproject commit 5cc33733ed76991ee3e5db55a21269be83dd7198
diff --git a/playbooks/roles/sshd b/playbooks/roles/sshd
@@ -1 +1 @@
-Subproject commit abfd5ce80ecfda1d9834809365e3d70bcea07c3e
+Subproject commit dea302d657801d09664b313c2bf5c5d962b1c9b2
diff --git a/playbooks/roles/timezone b/playbooks/roles/timezone
@@ -1 +1 @@
-Subproject commit 36bccf3e5cf8d29e308cd26aa589639f64f229de
+Subproject commit 809b4ba514723ea5a8d5fcce558c2a7687b0b282
diff --git a/scripts/bootstrap-ansible.sh b/scripts/bootstrap-ansible.sh
@@ -32,7 +32,7 @@ fi
 # Prepare Zypper dependencies
 if [ -x "$(command -v zypper)" ]; then
     zypper -n --gpg-auto-import-keys refresh
-    zypper -n install -y ca-certificates* curl gcc libffi-devel libopenssl-devel make python3 python3-devel python3-xml sudo
+    zypper -n install -y ca-certificates curl gcc libffi-devel libopenssl-devel make python3 python3-devel sudo
 fi
 
 # Install PIP
