Merge pull request #1548 from swordqiu/hotfix/qj-support-arch-linux

fix: support archlinxu

Author: swordqiu

lib/add_node.py

@@ -7,22 +7,7 @@
 from .service import AddNodeService, AddNodesConfig
 from .cluster import construct_cluster
 from .parser import inject_add_nodes_runtime_options
-
-
-def is_ipv4(addr):
-    try:
-        socket.inet_pton(socket.AF_INET, addr)
-        return True
-    except (OSError, AttributeError, socket.error):
-        return False
-
-
-def is_ipv6(addr):
-    try:
-        socket.inet_pton(socket.AF_INET6, addr)
-        return True
-    except (OSError, AttributeError, socket.error):
-        return False
+from .utils import is_ipv4, is_ipv6
 
 
 class AddWorkerNodeService(AddNodeService):

lib/service.py

@@ -12,6 +12,7 @@
 from .parser import inject_ssh_hosts_options
 from . import utils
 from . import ansible
+from . import consts
 from .cluster import construct_cluster
 from .ocboot import WorkerConfig, Config
 from .ocboot import get_ansible_global_vars
@@ -164,13 +165,40 @@ def do_action(self, args):
             args.ssh_private_file,
             args.ssh_port)
 
+        if args.ip_type == '':
+            if utils.is_ipv4(args.primary_master_host):
+                args.ip_type = consts.IP_TYPE_IPV4
+            elif utils.is_ipv6(args.primary_master_host):
+                args.ip_type = consts.IP_TYPE_IPV6
+            else:
+                raise ValueError("ip type is not set and cannot be determined from primary master host")
+
+        # 处理双栈配置
+        kwargs = {
+            'ip_dual_conf': getattr(args, 'ip_dual_conf', None),
+            'ip_type': args.ip_type,
+            'offline_data_path': args.offline_data_path,
+        }
+
+        # 如果是双栈配置，需要处理IPv4和IPv6地址
+        if args.ip_type == consts.IP_TYPE_DUAL_STACK and hasattr(args, 'ip_dual_conf') and args.ip_dual_conf:
+            # 确定哪个是IPv4，哪个是IPv6
+            if utils.is_ipv4(args.target_node_hosts[0]):
+                # 主IP是IPv4，ip_dual_conf是IPv6
+                kwargs['node_ip_v4'] = args.target_node_hosts[0]
+                kwargs['node_ip_v6'] = args.ip_dual_conf
+            else:
+                # 主IP是IPv6，ip_dual_conf是IPv4
+                kwargs['node_ip_v4'] = args.ip_dual_conf
+                kwargs['node_ip_v6'] = args.target_node_hosts[0]
+
         config = AddNodesConfig(cluster,
                                 args.target_node_hosts,
                                 args.ssh_user,
                                 args.ssh_private_file,
                                 args.ssh_port,
                                 args.ssh_node_port,
-                                False, True)
+                                enable_host_on_vm=False, enable_lbagent=True, **kwargs)
         return config.run()
 
 

lib/utils.py

@@ -115,3 +115,16 @@ def generage_random_string(N=12):
         random.choice(string.ascii_uppercase + string.digits)
         for _ in range(N))
 
+def is_ipv4(addr):
+    try:
+        socket.inet_pton(socket.AF_INET, addr)
+        return True
+    except (OSError, AttributeError, socket.error):
+        return False
+
+def is_ipv6(addr):
+    try:
+        socket.inet_pton(socket.AF_INET6, addr)
+        return True
+    except (OSError, AttributeError, socket.error):
+        return False

onecloud/roles/common/tasks/main.yml

@@ -3,6 +3,13 @@
 #   include_role:
 #     name: utils/misc-check
 
+- name: Verify OS is not debian based when lbagent is enabled
+  fail:
+    msg: "Cannot deploy lbagent on Debian based OS (AppArmor enabled OS)"
+  when:
+    - enable_lbagent
+    - ansible_os_family == 'Debian'
+
 # 这里设置 primary_master_node_ip ，如果 primary_master_node_ip 不存在，则使用 hostvars[groups['primary_master_node'][0]]['node_ip']
 - name: set primary_master_node_ip if not defined
   set_fact:
@@ -218,3 +225,8 @@
 - name: Include cronjobs
   include_role:
     name: utils/cronjobs
+
+- name: Install ceph and openvswitch scripts
+  include_tasks: "symlink.yml"
+  when:
+  - onecloud_version is version('v4.0', '>=')

onecloud/roles/common/tasks/os/archlinux.yml

@@ -0,0 +1,56 @@
+- name: Online pacman repo
+  ansible.builtin.blockinfile:
+    path: /etc/pacman.conf
+    block: |
+      [yunion]
+      SigLevel = Optional TrustAll
+      Server = https://iso.yunion.cn/archlinux/$repo/$arch/
+    marker: "# {mark} ANSIBLE MANAGED BLOCK - yunion repo"
+    insertafter: EOF
+    create: true
+    mode: '0600'
+  become: yes
+  when:
+  - online_status is defined
+  - online_status == 'online'
+
+- name: ensure pacman repo synchronized
+  shell: |
+    pacman -Syy
+  become: true
+
+- name: Install Common Packages Via Loop
+  package:
+    name: "{{ package_item }}"
+  retries: 3
+  delay: 3
+  with_items:
+  - "{{ common_packages }}"
+  loop_control:
+    index_var: item_index
+    label: "[{{ '%02d'|format(item_index + 1) }}/{{ common_packages|length }}] {{ package_item }}"
+    loop_var: package_item
+  become: yes
+  tags:
+  - package
+
+- name: Install Latest Packages Via Loop {{ onecloud_version_abbr }}
+  package:
+    name: "{{ package_item }}"
+    state: latest
+  with_items:
+  - "{{ latest_packages }}"
+  become: yes
+  retries: 6
+  delay: 10
+  register: latest_pkg_result
+  until: latest_pkg_result.rc == 0
+  ignore_errors: yes
+  when:
+  - latest_packages is defined
+  loop_control:
+    index_var: item_index
+    label: "[{{ item_index + 1 }}/{{ latest_packages | length }}] {{ package_item | regex_replace('\\[.*|[*]', '') }}"
+    loop_var: package_item
+  tags:
+  - package

onecloud/roles/common/tasks/os/debian_family.yml

@@ -69,7 +69,23 @@
     - onecloud_version is defined
     - onecloud_version is version('v3.10', '<=')
 
-- name: install common packages via loop for Debian Family
+- name: Append ovs_packages to common_packages if ovs_packages is defined
+  set_fact:
+    common_packages: "{{ common_packages + ovs_packages }}"
+  when:
+  - ovs_packages is defined
+  - common_packages is defined
+  - onecloud_version is version('v4.0', '<')
+
+- name: Append ceph_packages to common_packages if ceph_packages is defined
+  set_fact:
+    common_packages: "{{ common_packages + ceph_packages }}"
+  when:
+  - ceph_packages is defined
+  - common_packages is defined
+  - onecloud_version is version('v4.0', '<')
+
+- name: Install common packages via loop for Debian Family
   package:
     name: "{{ package_item }}"
   become: true

onecloud/roles/common/tasks/os/redhat-general-repo.yml

@@ -34,6 +34,22 @@
   - online_status is defined
   - online_status == 'offline'
 
+- name: Append ovs_preinstall_packages to preinstall_packages if ovs_preinstall_packages is defined
+  set_fact:
+    preinstall_packages: "{{ preinstall_packages + ovs_preinstall_packages }}"
+  when:
+  - ovs_preinstall_packages is defined
+  - preinstall_packages is defined
+  - onecloud_version is version('v4.0', '<')
+
+- name: Append ceph_preinstall_packages to preinstall_packages if ceph_preinstall_packages is defined
+  set_fact:
+    preinstall_packages: "{{ preinstall_packages + ceph_preinstall_packages }}"
+  when:
+  - ceph_preinstall_packages is defined
+  - preinstall_packages is defined
+  - onecloud_version is version('v4.0', '<')
+
 - name: Install Preinstall Packages Via Loop
   package:
     name: "{{ package_item }}"
@@ -54,7 +70,23 @@
   - preinstall_packages is defined
   - online_status == 'online'
 
-- name: Install additional repos
+- name: Append ovs_imported_repos to imported_repos if ovs_imported_repos is defined
+  set_fact:
+    imported_repos: "{{ imported_repos + ovs_imported_repos }}"
+  when:
+  - ovs_imported_repos is defined
+  - imported_repos is defined
+  - onecloud_version is version('v4.0', '<')
+
+- name: Append ceph_imported_repos to imported_repos if ceph_imported_repos is defined
+  set_fact:
+    imported_repos: "{{ imported_repos + ceph_imported_repos }}"
+  when:
+  - ceph_imported_repos is defined
+  - imported_repos is defined
+  - onecloud_version is version('v4.0', '<')
+
+- name: Import additional repos
   shell: |
     REPO_NAME="yunion-repo-extra-{{ item_index }}"
     REPO_FILE="/etc/yum.repos.d/yunion-extra.repo"

onecloud/roles/common/tasks/os/redhat.yml

@@ -14,6 +14,22 @@
   - extra_packages is defined
   - common_packages is defined
 
+- name: Append ovs_packages to common_packages if ovs_packages is defined
+  set_fact:
+    common_packages: "{{ common_packages + ovs_packages }}"
+  when:
+  - ovs_packages is defined
+  - common_packages is defined
+  - onecloud_version is version('v4.0', '<')
+
+- name: Append ceph_packages to common_packages if ceph_packages is defined
+  set_fact:
+    common_packages: "{{ common_packages + ceph_packages }}"
+  when:
+  - ceph_packages is defined
+  - common_packages is defined
+  - onecloud_version is version('v4.0', '<')
+
 - name: Install Common Packages Via Loop
   package:
     name: "{{ package_item }}"

onecloud/roles/common/tasks/symlink.yml

@@ -0,0 +1,44 @@
+---
+- name: install ceph scripts
+  template:
+    src: ceph.sh.j2
+    dest: /opt/yunion/bin/ceph.sh
+    mode: '0755'
+
+- name: install openvswitch scripts
+  template:
+    src: ovs.sh.j2
+    dest: /opt/yunion/bin/ovs.sh
+    mode: '0755'
+
+- name: install ceph
+  file:
+    src: /opt/yunion/bin/ceph.sh
+    dest: /usr/local/bin/ceph
+    state: link
+    force: yes
+  become: true
+
+- name: install ovs-vsctl
+  file:
+    src: /opt/yunion/bin/ovs.sh
+    dest: /usr/local/bin/ovs-vsctl
+    state: link
+    force: yes
+  become: true
+
+- name: install ovs-ofctl
+  file:
+    src: /opt/yunion/bin/ovs.sh
+    dest: /usr/local/bin/ovs-ofctl
+    state: link
+    force: yes
+  become: true
+
+- name: install ovs-appctl
+  file:
+    src: /opt/yunion/bin/ovs.sh
+    dest: /usr/local/bin/ovs-appctl
+    state: link
+    force: yes
+  become: true

onecloud/roles/common/templates/ceph.sh.j2

@@ -0,0 +1,22 @@
+#!/bin/bash
+
+IMG={{ insecure_registry | default('registry.cn-beijing.aliyuncs.com') }}/{{ registry | default('yunionio') }}/ceph:v16.2.14
+
+{% if k8s_or_k3s | default('k3s') == 'k3s' %}
+k3s ctr images list name==$IMG -q | grep $IMG > /dev/null
+if [ $? -ne 0 ]; then
+    k3s ctr images pull $IMG
+fi
+
+k3s ctr run --rm --net-host -t \
+    --mount type=bind,src=/tmp,dst=/tmp,options=rbind \
+    $IMG \
+    ceph-common \
+    /usr/bin/$(basename $0) $@
+{% else %}
+docker run --rm --network host \
+    -v /tmp:/tmp \
+    $IMG \
+    /usr/bin/$(basename $0) $@
+{% endif %}
+