From 86fd8dd1344cda72386756be928cbc62b5746ccf Mon Sep 17 00:00:00 2001
From: jinyuanliu <liujinyuan@inspur.com>
Date: Thu, 4 Mar 2021 21:44:18 +0800
Subject: [PATCH] Remove congress residue
About congress chart,It's been removed,Remove congress residue now.
Related-Bug: #1917762
Change-Id: Ib52e77330cadf45bd3353bfaedc251485620d9f8
---
keystone/Chart.yaml | 2 +-
keystone/values_overrides/netpol.yaml | 3 --
releasenotes/notes/keystone.yaml | 1 +
tools/deployment/multinode/200-congress.sh | 33 ----------------------
4 files changed, 2 insertions(+), 37 deletions(-)
delete mode 100755 tools/deployment/multinode/200-congress.sh
diff --git a/keystone/Chart.yaml b/keystone/Chart.yaml
index 7cc042a619..08fccf108d 100644
--- a/keystone/Chart.yaml
+++ b/keystone/Chart.yaml
@@ -14,7 +14,7 @@ apiVersion: v1
appVersion: v1.0.0
description: OpenStack-Helm Keystone
name: keystone
-version: 0.1.10
+version: 0.1.11
home: https://docs.openstack.org/keystone/latest/
icon: https://www.openstack.org/themes/openstack/images/project-mascots/Keystone/OpenStack_Project_Keystone_vertical.png
sources:
diff --git a/keystone/values_overrides/netpol.yaml b/keystone/values_overrides/netpol.yaml
index db373fbcd4..6914575411 100644
--- a/keystone/values_overrides/netpol.yaml
+++ b/keystone/values_overrides/netpol.yaml
@@ -23,9 +23,6 @@ network_policy:
- podSelector:
matchLabels:
application: cinder
- - podSelector:
- matchLabels:
- application: congress
- podSelector:
matchLabels:
application: barbican
diff --git a/releasenotes/notes/keystone.yaml b/releasenotes/notes/keystone.yaml
index 74863ca015..8d1b25895e 100644
--- a/releasenotes/notes/keystone.yaml
+++ b/releasenotes/notes/keystone.yaml
@@ -11,4 +11,5 @@ keystone:
- 0.1.8 Change Issuer to ClusterIssuer
- 0.1.9 Add helm.sh/hook related annotations
- 0.1.10 Update RBAC apiVersion from /v1beta1 to /v1
+ - 0.1.11 Remove congress residue
...
diff --git a/tools/deployment/multinode/200-congress.sh b/tools/deployment/multinode/200-congress.sh
deleted file mode 100755
index ab226968ce..0000000000
--- a/tools/deployment/multinode/200-congress.sh
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/bash
-
-# Licensed under the Apache License, Version 2.0 (the "License"); you may
-# not use this file except in compliance with the License. You may obtain
-# a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# License for the specific language governing permissions and limitations
-# under the License.
-set -xe
-
-#NOTE: Deploy command
-# don't scale out ds node
-# only one node per environment should be in active state
-# https://docs.openstack.org/congress/latest/admin/ha-overview.html#ha-overview
-helm upgrade --install congress ./congress \
- --namespace=openstack \
- --set pod.replicas.api=2 \
- --set pod.replicas.policy_engine=2 \
- --set pod.replicas.datasource=1 \
- ${OSH_EXTRA_HELM_ARGS} \
- ${OSH_EXTRA_HELM_ARGS_CONGRESS}
-
-#NOTE: Wait for deploy
-./tools/deployment/common/wait-for-pods.sh openstack
-
-#NOTE: Validate Deployment info
-export OS_CLOUD=openstack_helm
-openstack service list