diff options
| author | Lingxian Kong <anlin.kong@gmail.com> | 2021-06-18 23:16:00 +1200 |
|---|---|---|
| committer | Lingxian Kong <anlin.kong@gmail.com> | 2021-06-19 16:47:31 +1200 |
| commit | 03e5512695f95aae4822c78db9f4cf9ec6eef7f9 (patch) | |
| tree | c6c9979805aac5f4c7bd4c0da12abace9efc3fed | |
| parent | 2114e8a7750f1e6ed0aa2fbc36c7655abf48df0e (diff) | |
| download | trove-03e5512695f95aae4822c78db9f4cf9ec6eef7f9.tar.gz | |
Support customized database container images in DevStack
Story: 2008990
Task: 42643
Change-Id: Ie62e9aa1863d705a60b244981c9dee160d50d2dc
| -rw-r--r-- | devstack/plugin.sh | 5 | ||||
| -rw-r--r-- | devstack/settings | 6 |
2 files changed, 11 insertions, 0 deletions
diff --git a/devstack/plugin.sh b/devstack/plugin.sh index dffe0298..7603261e 100644 --- a/devstack/plugin.sh +++ b/devstack/plugin.sh @@ -269,6 +269,11 @@ function configure_trove { iniset $TROVE_GUESTAGENT_CONF service_credentials region_name $REGION_NAME iniset $TROVE_GUESTAGENT_CONF service_credentials auth_url $TROVE_AUTH_ENDPOINT + iniset $TROVE_GUESTAGENT_CONF mysql docker_image ${TROVE_DATABASE_IMAGE_MYSQL} + iniset $TROVE_GUESTAGENT_CONF mysql backup_docker_image ${TROVE_DATABASE_BACKUP_IMAGE_MYSQL} + iniset $TROVE_GUESTAGENT_CONF postgresql docker_image ${TROVE_DATABASE_IMAGE_POSTGRES} + iniset $TROVE_GUESTAGENT_CONF postgresql backup_docker_image ${TROVE_DATABASE_BACKUP_IMAGE_POSTGRES} + # 1. To avoid 'Connection timed out' error of sudo command inside the guest agent # 2. Config the controller IP address used by guest-agent to download Trove code during initialization (only valid for dev_mode=true). common_cloudinit=/etc/trove/cloudinit/common.cloudinit diff --git a/devstack/settings b/devstack/settings index b7be68d0..8423f99d 100644 --- a/devstack/settings +++ b/devstack/settings @@ -85,3 +85,9 @@ CELLSV2_SETUP=singleconductor # Enable or disable the Trove guest image build during devstack installation. TROVE_ENABLE_IMAGE_BUILD=${TROVE_ENABLE_IMAGE_BUILD:-"true"} TROVE_NON_DEV_IMAGE_URL=${TROVE_NON_DEV_IMAGE_URL:-""} + +# Customized database container images +TROVE_DATABASE_IMAGE_MYSQL=${TROVE_DATABASE_IMAGE_MYSQL:-"catalystcloud/mysql"} +TROVE_DATABASE_IMAGE_POSTGRES=${TROVE_DATABASE_IMAGE_POSTGRES:-"catalystcloud/postgres"} +TROVE_DATABASE_BACKUP_IMAGE_MYSQL=${TROVE_DATABASE_BACKUP_IMAGE_MYSQL:-"catalystcloud/db-backup-mysql:1.1.0"} +TROVE_DATABASE_BACKUP_IMAGE_POSTGRES=${TROVE_DATABASE_BACKUP_IMAGE_POSTGRES:-"catalystcloud/db-backup-postgresql:1.1.0"} |