diff --git a/0001-openEuler-support-for-OpenStack-Helm.patch b/0001-openEuler-support-for-OpenStack-Helm.patch index 25cd9987d7cb1a182c868180b81be1a52e9af989..fdf4ec916d5a40d1b09b3291f05602d06f411117 100644 --- a/0001-openEuler-support-for-OpenStack-Helm.patch +++ b/0001-openEuler-support-for-OpenStack-Helm.patch @@ -14,10 +14,10 @@ Subject: [PATCH] openEuler support for OpenStack-Helm codebase .../source/nova/templates/bin/_nova-compute-init.sh.tpl | 4 +++- 8 files changed, 11 insertions(+), 9 deletions(-) -diff --git a/openstack-helm/source/neutron/templates/bin/_neutron-dhcp-agent-init.sh.tpl b/openstack-helm/source/neutron/templates/bin/_neutron-dhcp-agent-init.sh.tpl +diff --git a/neutron/templates/bin/_neutron-dhcp-agent-init.sh.tpl b/neutron/templates/bin/_neutron-dhcp-agent-init.sh.tpl index 3df3315..7a286f1 100644 ---- a/openstack-helm/source/neutron/templates/bin/_neutron-dhcp-agent-init.sh.tpl -+++ b/openstack-helm/source/neutron/templates/bin/_neutron-dhcp-agent-init.sh.tpl +--- a/neutron/templates/bin/_neutron-dhcp-agent-init.sh.tpl ++++ b/neutron/templates/bin/_neutron-dhcp-agent-init.sh.tpl @@ -20,6 +20,6 @@ set -ex mkdir -p /tmp/pod-shared tee > /tmp/pod-shared/neutron-agent.ini << EOF @@ -26,10 +26,10 @@ index 3df3315..7a286f1 100644 +host = $(hostname) EOF {{- end }} -diff --git a/openstack-helm/source/neutron/templates/bin/_neutron-l3-agent-init.sh.tpl b/openstack-helm/source/neutron/templates/bin/_neutron-l3-agent-init.sh.tpl +diff --git a/neutron/templates/bin/_neutron-l3-agent-init.sh.tpl b/neutron/templates/bin/_neutron-l3-agent-init.sh.tpl index b9b93b2..4282bb2 100644 ---- a/openstack-helm/source/neutron/templates/bin/_neutron-l3-agent-init.sh.tpl -+++ b/openstack-helm/source/neutron/templates/bin/_neutron-l3-agent-init.sh.tpl +--- a/neutron/templates/bin/_neutron-l3-agent-init.sh.tpl ++++ b/neutron/templates/bin/_neutron-l3-agent-init.sh.tpl @@ -20,6 +20,6 @@ set -ex mkdir -p /tmp/pod-shared tee > /tmp/pod-shared/neutron-agent.ini << EOF @@ -38,10 +38,10 @@ index b9b93b2..4282bb2 100644 +host = $(hostname) EOF {{- end }} -diff --git a/openstack-helm/source/neutron/templates/bin/_neutron-linuxbridge-agent-init.sh.tpl b/openstack-helm/source/neutron/templates/bin/_neutron-linuxbridge-agent-init.sh.tpl +diff --git a/neutron/templates/bin/_neutron-linuxbridge-agent-init.sh.tpl b/neutron/templates/bin/_neutron-linuxbridge-agent-init.sh.tpl index ed95189..26bef05 100644 ---- a/openstack-helm/source/neutron/templates/bin/_neutron-linuxbridge-agent-init.sh.tpl -+++ b/openstack-helm/source/neutron/templates/bin/_neutron-linuxbridge-agent-init.sh.tpl +--- a/neutron/templates/bin/_neutron-linuxbridge-agent-init.sh.tpl ++++ b/neutron/templates/bin/_neutron-linuxbridge-agent-init.sh.tpl @@ -61,6 +61,6 @@ EOF mkdir -p /tmp/pod-shared tee > /tmp/pod-shared/neutron-agent.ini << EOF @@ -50,10 +50,10 @@ index ed95189..26bef05 100644 +host = $(hostname) EOF {{- end }} -diff --git a/openstack-helm/source/neutron/templates/bin/_neutron-metadata-agent-init.sh.tpl b/openstack-helm/source/neutron/templates/bin/_neutron-metadata-agent-init.sh.tpl +diff --git a/neutron/templates/bin/_neutron-metadata-agent-init.sh.tpl b/neutron/templates/bin/_neutron-metadata-agent-init.sh.tpl index 5b6ce43..91f0e8b 100644 ---- a/openstack-helm/source/neutron/templates/bin/_neutron-metadata-agent-init.sh.tpl -+++ b/openstack-helm/source/neutron/templates/bin/_neutron-metadata-agent-init.sh.tpl +--- a/neutron/templates/bin/_neutron-metadata-agent-init.sh.tpl ++++ b/neutron/templates/bin/_neutron-metadata-agent-init.sh.tpl @@ -22,6 +22,6 @@ chown ${NEUTRON_USER_UID} /var/lib/neutron/openstack-helm mkdir -p /tmp/pod-shared tee > /tmp/pod-shared/neutron-agent.ini << EOF @@ -62,10 +62,10 @@ index 5b6ce43..91f0e8b 100644 +host = $(hostname) EOF {{- end }} -diff --git a/openstack-helm/source/neutron/templates/bin/_neutron-openvswitch-agent-init.sh.tpl b/openstack-helm/source/neutron/templates/bin/_neutron-openvswitch-agent-init.sh.tpl +diff --git a/neutron/templates/bin/_neutron-openvswitch-agent-init.sh.tpl b/neutron/templates/bin/_neutron-openvswitch-agent-init.sh.tpl index 3283e09..8bb540b 100644 ---- a/openstack-helm/source/neutron/templates/bin/_neutron-openvswitch-agent-init.sh.tpl -+++ b/openstack-helm/source/neutron/templates/bin/_neutron-openvswitch-agent-init.sh.tpl +--- a/neutron/templates/bin/_neutron-openvswitch-agent-init.sh.tpl ++++ b/neutron/templates/bin/_neutron-openvswitch-agent-init.sh.tpl @@ -491,6 +491,6 @@ fi mkdir -p /tmp/pod-shared tee > /tmp/pod-shared/neutron-agent.ini << EOF @@ -74,10 +74,10 @@ index 3283e09..8bb540b 100644 +host = $(hostname) EOF {{- end }} -diff --git a/openstack-helm/source/neutron/templates/bin/_neutron-sriov-agent-init.sh.tpl b/openstack-helm/source/neutron/templates/bin/_neutron-sriov-agent-init.sh.tpl +diff --git a/neutron/templates/bin/_neutron-sriov-agent-init.sh.tpl b/neutron/templates/bin/_neutron-sriov-agent-init.sh.tpl index d98cfe8..5ced238 100644 ---- a/openstack-helm/source/neutron/templates/bin/_neutron-sriov-agent-init.sh.tpl -+++ b/openstack-helm/source/neutron/templates/bin/_neutron-sriov-agent-init.sh.tpl +--- a/neutron/templates/bin/_neutron-sriov-agent-init.sh.tpl ++++ b/neutron/templates/bin/_neutron-sriov-agent-init.sh.tpl @@ -99,7 +99,7 @@ ethtool --set-priv-flags ${NIC_FIRST_PORT} vf-true-promisc-support ${promisc_mod mkdir -p /tmp/pod-shared tee > /tmp/pod-shared/neutron-agent.ini << EOF @@ -87,10 +87,10 @@ index d98cfe8..5ced238 100644 EOF {{- end }} -diff --git a/openstack-helm/source/neutron/templates/daemonset-ovs-agent.yaml b/openstack-helm/source/neutron/templates/daemonset-ovs-agent.yaml +diff --git a/neutron/templates/daemonset-ovs-agent.yaml b/neutron/templates/daemonset-ovs-agent.yaml index 59e33f0..0f6999c 100644 ---- a/openstack-helm/source/neutron/templates/daemonset-ovs-agent.yaml -+++ b/openstack-helm/source/neutron/templates/daemonset-ovs-agent.yaml +--- a/neutron/templates/daemonset-ovs-agent.yaml ++++ b/neutron/templates/daemonset-ovs-agent.yaml @@ -116,8 +116,8 @@ spec: name: {{ $configMapName }} key: update_dpdk_bond_config @@ -102,10 +102,10 @@ index 59e33f0..0f6999c 100644 volumeMounts: - name: pod-tmp mountPath: /tmp -diff --git a/openstack-helm/source/nova/templates/bin/_nova-compute-init.sh.tpl b/openstack-helm/source/nova/templates/bin/_nova-compute-init.sh.tpl +diff --git a/nova/templates/bin/_nova-compute-init.sh.tpl b/nova/templates/bin/_nova-compute-init.sh.tpl index 0636b69..6e12537 100644 ---- a/openstack-helm/source/nova/templates/bin/_nova-compute-init.sh.tpl -+++ b/openstack-helm/source/nova/templates/bin/_nova-compute-init.sh.tpl +--- a/nova/templates/bin/_nova-compute-init.sh.tpl ++++ b/nova/templates/bin/_nova-compute-init.sh.tpl @@ -58,6 +58,8 @@ EOF {{- if and ( empty .Values.conf.nova.DEFAULT.host ) ( .Values.pod.use_fqdn.compute ) }} tee > /tmp/pod-shared/nova-compute-fqdn.conf << EOF diff --git a/0002-openEuler-support-for-OpenStack-Helm-infra.patch b/0002-openEuler-support-for-OpenStack-Helm-infra.patch index b4448576e843f602789080e5dd9ba8bbc448464d..8542a0020e958d9d18a003295052c3ce4bb4304f 100644 --- a/0002-openEuler-support-for-OpenStack-Helm-infra.patch +++ b/0002-openEuler-support-for-OpenStack-Helm-infra.patch @@ -10,10 +10,10 @@ Subject: [PATCH] openEuler support for OpenStack-Helm-Infra codebase .../source/tools/gate/devel/start.sh | 7 ++ 4 files changed, 138 insertions(+), 58 deletions(-) -diff --git a/openstack-helm-infra/source/tools/deployment/common/000-install-packages.sh b/openstack-helm-infra/source/tools/deployment/common/000-install-packages.sh +diff --git a/tools/deployment/common/000-install-packages.sh b/tools/deployment/common/000-install-packages.sh index 90118f9..f244d30 100755 ---- a/openstack-helm-infra/source/tools/deployment/common/000-install-packages.sh -+++ b/openstack-helm-infra/source/tools/deployment/common/000-install-packages.sh +--- a/tools/deployment/common/000-install-packages.sh ++++ b/tools/deployment/common/000-install-packages.sh @@ -14,8 +14,10 @@ set -xe @@ -43,10 +43,10 @@ index 90118f9..f244d30 100755 + python3-pip \ + bind-utils +fi -diff --git a/openstack-helm-infra/source/tools/gate/deploy-k8s-kubeadm.sh b/openstack-helm-infra/source/tools/gate/deploy-k8s-kubeadm.sh +diff --git a/tools/gate/deploy-k8s-kubeadm.sh b/tools/gate/deploy-k8s-kubeadm.sh index 507f0a9..ed44b01 100755 ---- a/openstack-helm-infra/source/tools/gate/deploy-k8s-kubeadm.sh -+++ b/openstack-helm-infra/source/tools/gate/deploy-k8s-kubeadm.sh +--- a/tools/gate/deploy-k8s-kubeadm.sh ++++ b/tools/gate/deploy-k8s-kubeadm.sh @@ -61,12 +61,15 @@ configure_resolvconf . /etc/os-release @@ -163,10 +163,10 @@ index 507f0a9..ed44b01 100755 mkdir -p $HOME/.kube sudo cp -i /etc/kubernetes/admin.conf $HOME/.kube/config sudo chown $(id -u):$(id -g) $HOME/.kube/config -diff --git a/openstack-helm-infra/source/tools/gate/deploy-k8s.sh b/openstack-helm-infra/source/tools/gate/deploy-k8s.sh +diff --git a/tools/gate/deploy-k8s.sh b/tools/gate/deploy-k8s.sh index 4e435cc..6e73bf2 100755 ---- a/openstack-helm-infra/source/tools/gate/deploy-k8s.sh -+++ b/openstack-helm-infra/source/tools/gate/deploy-k8s.sh +--- a/tools/gate/deploy-k8s.sh ++++ b/tools/gate/deploy-k8s.sh @@ -93,12 +93,15 @@ configure_resolvconf . /etc/os-release @@ -275,10 +275,10 @@ index 4e435cc..6e73bf2 100755 sudo -E tee /etc/modprobe.d/rbd.conf << EOF install rbd /bin/true -diff --git a/openstack-helm-infra/source/tools/gate/devel/start.sh b/openstack-helm-infra/source/tools/gate/devel/start.sh +diff --git a/tools/gate/devel/start.sh b/tools/gate/devel/start.sh index 7dbddf5..879846b 100755 ---- a/openstack-helm-infra/source/tools/gate/devel/start.sh -+++ b/openstack-helm-infra/source/tools/gate/devel/start.sh +--- a/tools/gate/devel/start.sh ++++ b/tools/gate/devel/start.sh @@ -43,6 +43,13 @@ function ansible_install { curl sudo curl -L -o /usr/bin/jq https://github.com/stedolan/jq/releases/download/jq-1.5/jq-linux64 diff --git a/openstack-plugin.spec b/openstack-plugin.spec index e5b3d34c8f6f9cda1df7e002385f907fcafb0175..4e0d3dbd38e13b7ee7383f176254796ac8d2e4cc 100644 --- a/openstack-plugin.spec +++ b/openstack-plugin.spec @@ -12,7 +12,7 @@ rm -rf %1/.git Name: openstack-plugin Version: 1.0.0 -Release: 1 +Release: 2 Summary: The plug-in package of openstack for openEuler License: Apache-2.0 URL: https://gitee.com/openeuler/openstack-plugin @@ -112,7 +112,7 @@ install -D -p -m 644 %{SOURCE4} %{buildroot}%{python3_sitelib}/openstack-plugin/ %gitPatch %{_datadir}/loci %{python3_sitelib}/openstack-plugin/%{SOURCE3} %post kolla -%gitPatch %{_datadir}/kolla %{python3_sitelib}/openstack-plugin/%{SOURCE4} +%gitPatch %{python3_sitelib}/kolla %{python3_sitelib}/openstack-plugin/%{SOURCE4} %preun nova %gitUnPatch %{python3_sitelib}/nova @@ -127,7 +127,7 @@ install -D -p -m 644 %{SOURCE4} %{buildroot}%{python3_sitelib}/openstack-plugin/ %gitUnPatch %{_datadir}/loci %preun kolla -%gitUnPatch %{_datadir}/kolla +%gitUnPatch %{python3_sitelib}/kolla %files priority-vm @@ -151,6 +151,9 @@ install -D -p -m 644 %{SOURCE4} %{buildroot}%{python3_sitelib}/openstack-plugin/ %{python3_sitelib}/openstack-plugin/%{SOURCE4} %changelog +* Wed Sep 07 2022 wangxiyuan - 1.0.0-2 +- Fix path and spec error + * Thu Sep 01 2022 wangxiyuan - 1.0.0-1 - Add kolla patch and format spec