Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

兼容 uos x86 开源部署 #64

Merged
merged 1 commit into from
Apr 8, 2021

Conversation

zhasm
Copy link
Contributor

@zhasm zhasm commented Apr 8, 2021

实现的功能

  • 兼容 uos x86 开源部署
  • 增加了备份并重置 iptable ruleset 的步骤。

向下合并

  • release/3.6

@yunion-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by:
To complete the pull request process, please assign zexi
You can assign the PR to them by writing /assign @zexi in a comment when ready.

The full list of commands accepted by this bot can be found here.

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@zhasm zhasm force-pushed the hotfix/rex-uos-x86-comp-3.6 branch from 3cd802a to 7e1ae80 Compare April 8, 2021 06:52
@zhasm zhasm force-pushed the hotfix/rex-uos-x86-comp-3.6 branch from 7e1ae80 to 9e44d64 Compare April 8, 2021 06:58
@zhasm zhasm changed the title 兼容 uos x86 开源部署 [wip] 兼容 uos x86 开源部署 Apr 8, 2021
@zhasm zhasm force-pushed the hotfix/rex-uos-x86-comp-3.6 branch 3 times, most recently from 079c57c to 3e246e8 Compare April 8, 2021 08:01
@zhasm zhasm changed the title [wip] 兼容 uos x86 开源部署 兼容 uos x86 开源部署 Apr 8, 2021
@@ -20,6 +20,11 @@
tags:
- facts

- name: set fact for uos
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

这种 UOS 相关的都放到对应的 vars 文件里面吧

args:
executable: /bin/bash

- name: Import task "{{ major_version_task_file }}"
include_tasks: "{{ major_version_task_file }}"
- name: reset iptables for UOS
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

这个 task 对 centos 生效吗?
是不是要加 when 的条件?

@@ -1,4 +1,5 @@
is_debian_arm64: true
is_uos_amd64: true
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

UOS 基于 Debian 系的,应该叫 is_debian 之类更合适。

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

还有这个文件不能改名,这个是对 debian 的支持

@zhasm zhasm force-pushed the hotfix/rex-uos-x86-comp-3.6 branch 4 times, most recently from 6eacac2 to 3ca9204 Compare April 8, 2021 10:33
- is_centos_x86 is defined

- name: init apt cache for uos
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

这个 task 和下面的是一样的吧?
debian 和 uos 都是用的这个源

@zhasm zhasm force-pushed the hotfix/rex-uos-x86-comp-3.6 branch from 9ac2032 to 604b9d4 Compare April 8, 2021 11:46
@@ -170,7 +187,7 @@
when: ansible_swaptotal_mb > 0

- name: Create a directory if it does not exist
file:
ansible.builtin.file:
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

这个改为 file ,ansible.builtin.file 这种用法低版本不支持

@zhasm zhasm force-pushed the hotfix/rex-uos-x86-comp-3.6 branch from 604b9d4 to 3c6ce5f Compare April 8, 2021 12:04
@zexi zexi merged commit 189da7b into yunionio:master Apr 8, 2021
zexi added a commit that referenced this pull request Apr 8, 2021
…am-release-3.6

Automated cherry pick of #64: 兼容 uos x86 开源部署
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants