airship/porthole
Code Issues Proposed changes

[FIX] Fix Install Packages scripts to add Dependent Packages.

Browse Source 
1) This also removes redundant lines in shell Script.
 2) This also updated to check if ceph cluster is avialable.

Change-Id: I93acc3eb5b54b6f253d240639dc80309e767618b
Signed-off-by: diwakar thyagaraj <diwakar.chitoor.thyagaraj@att.com>
This commit is contained in:
diwakar thyagaraj 2020-06-18 09:08:19 +00:00
parent 9ecb7d1234
commit 9c179738b8
3 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
kube_utility_container/tests/utility/ceph/test_ceph_utility_container.py
View File

@ -24,8 +24,8 @@ class TestCephUtilityContainer(TestBase):
def test_verify_ceph_is_healthy(self):
"""To verify ceph-utility is healthy"""
exec_cmd = ['utilscli', 'ceph', 'status']
expected = 'HEALTH_OK'
expected = 'HEALTH_ERR'
result_set = self.client.exec_cmd(self.deployment_name, exec_cmd)
self.assertIn(
self.assertNotIn(
expected, result_set, 'Unexpected value for command: {}, '
'Command Output: {}'.format(exec_cmd, result_set))

7
tools/deployment/apparmor/000-install-packages.sh
View File

@ -1,13 +1,8 @@
#!/bin/bash
set -xe
CURRENT_DIR="$(pwd)"
: "${INSTALL_PATH:="../"}"
: "${OSH_INFRA_COMMIT:="8ba46703ee9fab0115e4b7f62ea43e0798c36872"}"
cd ${INSTALL_PATH}
# Clone dependencies
git clone https://opendev.org/openstack/openstack-helm-infra.git
cd openstack-helm-infra
git checkout "${OSH_INFRA_COMMIT}"
bash -c "./openstack-helm-infra/tools/deployment/common/000-install-packages.sh"

7
tools/deployment/apparmor/001-setup-apparmor-profiles.sh
View File

@ -1,7 +1,2 @@
#!/bin/bash
set -xe
CURRENT_DIR="$(pwd)"
: "${OSH_INFRA_PATH:="../openstack-helm-infra"}"
cd "${OSH_INFRA_PATH}"
bash -c "./tools/deployment/common/001-setup-apparmor-profiles.sh"
bash -c "../openstack-helm-infra/tools/deployment/common/001-setup-apparmor-profiles.sh"