diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-09-24 17:56:23 +0200 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-09-26 16:17:59 +0000 |
| commit | a2d33ce77ec3125c5b31ca8cdf0e0be798e671ef (patch) | |
| tree | 5374c38300cc680e5fc58428eb65b872ce37d72d | |
| parent | eec6273084ebc69447c479f559472d741143d0c2 (diff) | |
[ha] Fix missing aodh_version param
_param:aodh_version was lost during a recent refactor, bring it back.
While at it, also make chown in entrypoint.sh recursive to prepare
for non-sudo deployments.
Fixes: c0de0902
Change-Id: I41b225c4a3f15269aa156a1c33412206beff6ee9
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit 6bb830d62451e608cca959e5cb00cd383c8cf01d)
| -rwxr-xr-x | ci/deploy.sh | 2 | ||||
| -rw-r--r-- | mcp/reclass/classes/cluster/mcp-common-ha/openstack_init.yml.j2 | 1 | ||||
| -rwxr-xr-x | mcp/scripts/docker-compose/files/entrypoint.sh | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/ci/deploy.sh b/ci/deploy.sh index af60ddfef..a899970fe 100755 --- a/ci/deploy.sh +++ b/ci/deploy.sh @@ -248,7 +248,7 @@ pushd "${DEPLOY_DIR}" > /dev/null # Install required packages on jump server sudo mkdir -p "${MCP_STORAGE_DIR}" -sudo chown "${USER}:${USER}" "${MCP_STORAGE_DIR}" +sudo chown -R "${USER}:${USER}" "${MCP_STORAGE_DIR}" if [ ${USE_EXISTING_PKGS} -eq 1 ]; then notify "[NOTE] Skipping distro pkg installation" 2 else diff --git a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_init.yml.j2 b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_init.yml.j2 index b08837876..7322378eb 100644 --- a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_init.yml.j2 +++ b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_init.yml.j2 @@ -153,6 +153,7 @@ parameters: glusterfs_service_host: ${_param:openstack_control_address} {%- endif %} mysql_admin_user: root + aodh_version: ${_param:openstack_version} barbican_version: ${_param:openstack_version} barbican_service_host: ${_param:openstack_control_address} barbican_integration_enabled: true diff --git a/mcp/scripts/docker-compose/files/entrypoint.sh b/mcp/scripts/docker-compose/files/entrypoint.sh index c7f7f9118..0becb6333 100755 --- a/mcp/scripts/docker-compose/files/entrypoint.sh +++ b/mcp/scripts/docker-compose/files/entrypoint.sh @@ -78,7 +78,7 @@ sed -i -e "s|return 'start/running' in |return 'is running' in |" \ find -L /srv/salt /srv/salt/env/prd/_* -maxdepth 1 -type l -delete # Fix up any permissions after above file shuffling -sudo chown root:root -R /srv/salt +chown root:root -R /srv/salt service ssh start service salt-minion start |