openstack/skyline-apiserver
Code Issues Proposed changes

docs: update kolla-ansible deploy skyline steps

Browse Source 
remove kolla-ansible skyline patch
since that has been merged into kolla-ansible.

Change-Id: Ie7e552e9514b91b97a6d6a87b1ee477d56f58710
This commit is contained in:
iauhsnaiq 2023-07-07 17:37:01 +08:00
parent ca3b13fd9a
commit 69271313e3
2 changed files with 0 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
kolla/README-zh_CN.md
View File

@ -10,8 +10,6 @@
- kolla : `https://github.com/openstack/kolla`
- kolla-ansible : `https://github.com/openstack/kolla-ansible`
- kolla skyline patch包 : `https://opendev.org/skyline/skyline-apiserver/src/branch/master/kolla/kolla-xxxxxxx.diff`
- kolla-ansible skyline patch包 : `https://opendev.org/skyline/skyline-apiserver/src/branch/master/kolla/kolla-ansible-xxxxxxx.diff`
## kolla build docker image
@ -20,34 +18,10 @@
```shell
cd /opt
git clone https://github.com/openstack/kolla
curl https://opendev.org/skyline/skyline-apiserver/src/branch/master/kolla/kolla-xxxxxxx.diff -o kolla.diff
cd /opt/kolla
git apply --check /opt/kolla.diff
git apply /opt/kolla.diff
sudo pip3 install /opt/kolla
```
- 若部署环境已安装 kolla
获取 kolla 安装目录
```shell
KOLLA_PACKAGE_PATH=$(python3 -c "import kolla;from pathlib import Path;print(Path(kolla.__file__).parents[1])")
KOLLA_DATA_FILES_PATH=$(python3 -c "import kolla;from pathlib import Path;print(Path(kolla.__file__).parents[4].joinpath('share/kolla'))")
```
安装 kolla patch 包
```shell
curl https://opendev.org/skyline/skyline-apiserver/src/branch/master/kolla/kolla-xxxxxxx.diff -o /opt/kolla.diff
cd ${KOLLA_PACKAGE_PATH}
git apply --check --include='kolla/*' /opt/kolla.diff
git apply --include='kolla/*' /opt/kolla.diff
cd ${KOLLA_DATA_FILES_PATH}
git apply --check --include='docker/*' /opt/kolla.diff
git apply --include='docker/*' /opt/kolla.diff
```
### skyline 镜像构建
> **注 : skyline 镜像目前仅支持 ubuntu-source-skyline 版本**
@ -72,30 +46,10 @@ kolla-build -b ubuntu -t source -n kolla --tag master --registry 127.0.0.1:4000
```shell
cd /opt
git clone https://github.com/openstack/kolla-ansible
curl https://opendev.org/skyline/skyline-apiserver/src/branch/master/kolla/kolla-ansible-xxxxxxx.diff -o kolla-ansible.diff
cd /opt/kolla-ansible
git apply --check /opt/kolla-ansible.diff
git apply /opt/kolla-ansible.diff
sudo pip3 install /opt/kolla-ansible
```
- 若部署环境已安装 kolla-ansible
获取 kolla-ansible 安装目录
```shell
KOLLA_ANSIBLE_DATA_FILES_PATH=$(python3 -c "import kolla_ansible;from pathlib import Path;print(Path(kolla_ansible.__file__).parents[4].joinpath('share/kolla-ansible'))")
```
安装 kolla-ansible patch 包
```shell
curl https://opendev.org/skyline/skyline-apiserver/src/branch/master/kolla/kolla-ansible-xxxxxxx.diff -o /opt/kolla-ansible.diff
cd ${KOLLA_ANSIBLE_DATA_FILES_PATH}
git apply --check --include='ansible/*' /opt/kolla-ansible.diff
git apply --include='ansible/*' /opt/kolla-ansible.diff
```
### 配置文件
- 若没有配置文件(globals.yml/passwords.yml/all-in-one/multinode)，复制配置文件并生成密码

46
kolla/README.md
View File

@ -10,8 +10,6 @@
- kolla : `https://github.com/openstack/kolla`
- kolla-ansible : `https://github.com/openstack/kolla-ansible`
- kolla skyline patch : `https://opendev.org/skyline/skyline-apiserver/src/branch/master/kolla/kolla-xxxxxxx.diff`
- kolla-ansible skyline patch : `https://opendev.org/skyline/skyline-apiserver/src/branch/master/kolla/kolla-ansible-xxxxxxx.diff`
## kolla build docker image
@ -20,34 +18,10 @@
```shell
cd /opt
git clone https://github.com/openstack/kolla-ansible
curl https://opendev.org/skyline/skyline-apiserver/src/branch/master/kolla/kolla-ansible-xxxxxxx.diff -o kolla-ansible.diff
cd /opt/kolla-ansible
git apply --check /opt/kolla-ansible.diff
git apply /opt/kolla-ansible.diff
sudo pip3 install /opt/kolla-ansible
```
- If kolla has been installed in the deployment environment
Get the kolla installation directory:
```shell
KOLLA_PACKAGE_PATH=$(python3 -c "import kolla;from pathlib import Path;print(Path(kolla.__file__).parents[1])")
KOLLA_DATA_FILES_PATH=$(python3 -c "import kolla;from pathlib import Path;print(Path(kolla.__file__).parents[4].joinpath('share/kolla'))")
```
Install kolla patch
```shell
curl https://opendev.org/skyline/skyline-apiserver/src/branch/master/kolla/kolla-xxxxxxx.diff -o /opt/kolla.diff
cd ${KOLLA_PACKAGE_PATH}
git apply --check --include='kolla/*' /opt/kolla.diff
git apply --include='kolla/*' /opt/kolla.diff
cd ${KOLLA_DATA_FILES_PATH}
git apply --check --include='docker/*' /opt/kolla.diff
git apply --include='docker/*' /opt/kolla.diff
```
### Build skyline image
> **Note : Only provide ubuntu-source-skyline of skyline image**
@ -72,30 +46,10 @@ kolla-build -b ubuntu -t source -n kolla --tag master --registry 127.0.0.1:4000
```shell
cd /opt
git clone https://github.com/openstack/kolla-ansible
curl https://opendev.org/skyline/skyline-apiserver/src/branch/master/kolla/kolla-ansible-xxxxxxx.diff -o kolla-ansible.diff
cd /opt/kolla-ansible
git apply --check /opt/kolla-ansible.diff
git apply /opt/kolla-ansible.diff
sudo pip3 install /opt/kolla-ansible
```
- If kolla-ansible has been installed in the deployment environment
Get the kolla-ansible installation directory:
```shell
KOLLA_ANSIBLE_DATA_FILES_PATH=$(python3 -c "import kolla_ansible;from pathlib import Path;print(Path(kolla_ansible.__file__).parents[4].joinpath('share/kolla-ansible'))")
```
Install kolla-ansible patch
```shell
curl https://opendev.org/skyline/skyline-apiserver/src/branch/master/kolla/kolla-ansible-xxxxxxx.diff -o /opt/kolla-ansible.diff
cd ${KOLLA_ANSIBLE_DATA_FILES_PATH}
git apply --check --include='ansible/*' /opt/kolla-ansible.diff
git apply --include='ansible/*' /opt/kolla-ansible.diff
```
### Configuration
- If the configuration file does not exist(globals.yml/passwords.yml/all-in-one/multinode), copy the