Merge pull request yunionio#1 from yunionio/feature/use-3.1

Feature/use 3.1
zhasm · Mar 13, 2020 · 48336d3 · 48336d3
2 parents 3f422d5 + 7e2523f
commit 48336d3
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/lib/ansible.py b/lib/ansible.py
@@ -87,8 +87,8 @@ def new_site_item_primary_master(
     registry_mirrors=[],
     insecure_regs=[],
     image_repository=None,
-    onecloud_version="latest",
-    operator_version="latest",
+    onecloud_version=None,
+    operator_version=None,
     skip_docker_config=False,
     onecloud_user="admin",
     onecloud_user_password="admin@123",
@@ -102,15 +102,17 @@ def new_site_item_primary_master(
         "k8s_controlplane_host": controlplane_host,
         "k8s_controlplane_port": controlplane_port,
         "k8s_node_as_oc_host": as_host,
-        "onecloud_version": onecloud_version,
-        "operator_version": operator_version,
         "onecloud_user": onecloud_user,
         "onecloud_user_password": onecloud_user_password,
     }
     if image_repository is not None:
         vars["image_repository"] = image_repository
     if skip_docker_config:
         vars["skip_docker_config"] = True
+    if onecloud_version is not None:
+        vars["onecloud_version"] = onecloud_version
+    if operator_version is not None:
+        vars["operator_version"] = operator_version
     return new_site_item(
         PRIMARY_MASTER_NODE,
         "primary-master-node",
@@ -215,7 +217,7 @@ def fetch_primary_master_config(self, config):
         skip_docker_config = self.get_default_val(config, "skip_docker_config", False)
         onecloud_user = self.get_default_val(config, "onecloud_user", "admin")
         onecloud_user_password = self.get_default_val(config, "onecloud_user_password", "admin@123")
-        onecloud_version = self.get_default_val(config, "onecloud_version", "latest")
+        onecloud_version = self.get_default_val(config, "onecloud_version", None)
         self.primary_master_config = new_site_item_primary_master(
             db_host, db_user, db_passwd,
             chost, cport, as_host,

diff --git a/onecloud/roles/common/tasks/main.yml b/onecloud/roles/common/tasks/main.yml
@@ -9,7 +9,7 @@
 
 - name: Add yunion rpm repository
   get_url:
-    url: https://iso.yunion.cn/yumrepo-3.0/yunion.repo
+    url: https://iso.yunion.cn/yumrepo-3.1/yunion.repo
     dest: /etc/yum.repos.d/yunion.repo
   become: yes
 
@@ -38,7 +38,6 @@
   - yunion-qemu-2.12.1
   - yunion-ocadm
   - yunion-climc
-  - yunion-sdnagent
   - yunion-executor-server
   - kernel-3.10.0-1062.4.3.el7.yn20191203
   - kernel-devel-3.10.0-1062.4.3.el7.yn20191203
@@ -171,5 +170,4 @@
     enabled: yes
     state: started
   loop:
-  - yunion-host-sdnagent
   - yunion-executor
diff --git a/onecloud/roles/primary-master-node/tasks/main.yml b/onecloud/roles/primary-master-node/tasks/main.yml
@@ -31,7 +31,7 @@
   register: K8S_TOKEN
 
 - name: Pull ocadm images on node
-  command: "/opt/yunion/bin/ocadm config images pull --image-repository {{ image_repository | default('registry.cn-beijing.aliyuncs.com/yunionio')}} --onecloud-version {{ onecloud_version | default('latest') }}"
+  command: "/opt/yunion/bin/ocadm config images pull --image-repository {{ image_repository | default('registry.cn-beijing.aliyuncs.com/yunionio')}}"
   register: command_result
   changed_when: '"Image is up to date" not in command_result.stdout or "Already exists" not in command_result.stdout'
   when: K8S_TOKEN.stdout|length == 0
@@ -104,7 +104,7 @@
   environment:
     KUBECONFIG: /etc/kubernetes/admin.conf
   shell: 'kubectl get crd | grep onecloudcluster'
-  retries: 6
+  retries: 30
   delay: 10
   register: result
   until: result.rc == 0