Skip to content

Commit

Permalink
Fix broken script use for non-master deployments
Browse files Browse the repository at this point in the history
Old code would error out deploying the database since templates weren't
properly made. We now ensure that we create the templates in both cases
though obviously the follower-deploy policy loading is left to the user
to properly do with the right policies.
  • Loading branch information
sgnn7 committed May 1, 2019
1 parent e7285b2 commit 8a98d9c
Showing 1 changed file with 9 additions and 3 deletions.
12 changes: 9 additions & 3 deletions start
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,16 @@ set -xeuo pipefail

./1_create_test_app_namespace.sh

# This script is run for both follower-based and master-based installs
# since database initial password yaml templates are also generated in
# them as well. The scripts cannot be separated since master needs that
# generated password for policy loading and followers need it to even just
# start.
./2_load_conjur_policies.sh

# Only automatically run these script for dev/demo envs deploying a master
# cluster directly to k8s/oc
if [[ "${DEPLOY_MASTER_CLUSTER}" = "true" ]]; then
# Only automatically run these scripts for dev/demo envs deploying a master
# cluster directly to k8s/oc
./2_load_conjur_policies.sh
./3_init_conjur_cert_authority.sh
fi

Expand Down

0 comments on commit 8a98d9c

Please sign in to comment.