Skip to content

Commit c8b8c91

Browse files
committed
Revert "venus: add log management system"
Reason for revert: venus was not released for yoga and thus isn't available for this branch Fixed merge conflicts introduced by [0] and [1]. This reverts commit 3d51f06. [0] I8bdce3b76bc02fdcc029f90cf1984e6b3d4eb961 [1] I4fff070ffef0a10887e1f26809bb43d20f48ea35 Change-Id: Ic298608c5711916942c1001a4c1530c4d15912ef
1 parent f77793b commit c8b8c91

File tree

8 files changed

+0
-82
lines changed

8 files changed

+0
-82
lines changed

docker/venus/venus-api/Dockerfile.j2

Lines changed: 0 additions & 11 deletions
This file was deleted.

docker/venus/venus-base/Dockerfile.j2

Lines changed: 0 additions & 29 deletions
This file was deleted.

docker/venus/venus-base/extend_start.sh

Lines changed: 0 additions & 10 deletions
This file was deleted.

docker/venus/venus-manager/Dockerfile.j2

Lines changed: 0 additions & 13 deletions
This file was deleted.

kolla/common/config.py

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -621,12 +621,6 @@
621621
'type': 'url',
622622
'location': ('$tarballs_base/openstack/trove/'
623623
'trove-${openstack_branch}.tar.gz')},
624-
# FIXME(mgoddard): Revert to ${openstack_branch} when a stable-yoga tarball
625-
# exists.
626-
'venus-base': {
627-
'type': 'url',
628-
'location': ('$tarballs_base/openstack/venus/'
629-
'venus-master.tar.gz')},
630624
'vitrage-base': {
631625
'type': 'url',
632626
'location': ('$tarballs_base/openstack/vitrage/'
@@ -957,10 +951,6 @@
957951
'letsencrypt-user': {
958952
'uid': 42488,
959953
'gid': 42488,
960-
},
961-
'venus-user': {
962-
'uid': 42489,
963-
'gid': 42489,
964954
}
965955
}
966956

kolla/image/build.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,6 @@ class Status(Enum):
9595
"monasca-base",
9696
"monasca-thresh",
9797
"solum-base",
98-
"venus-base",
9998
"zun-base",
10099
},
101100

releasenotes/notes/add-venus-e2a9824f5ef5cf30.yaml

Lines changed: 0 additions & 7 deletions
This file was deleted.

roles/kolla-build-config/defaults/main.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@ kolla_build_sources:
6565
- tacker-base
6666
- mistral-base-plugin-tacker
6767
openstack/trove: trove-base
68-
openstack/venus: venus-base
6968
openstack/vitrage: vitrage-base
7069
openstack/watcher: watcher-base
7170
openstack/zun: zun-base

0 commit comments

Comments
 (0)