diff options
| -rw-r--r-- | .zuul.yaml | 9 | ||||
| -rw-r--r-- | devstack/designate_plugins/backend-powerdns | 2 | ||||
| -rwxr-xr-x | devstack/plugin.sh | 10 | ||||
| -rw-r--r-- | devstack/settings | 13 |
4 files changed, 18 insertions, 16 deletions
@@ -41,7 +41,7 @@ designate-zone-manager: true - job: - name: designate-bind9-py35 + name: designate-bind9-py36 parent: designate-bind9 vars: devstack_localrc: @@ -54,11 +54,6 @@ c-bak: false - job: - name: designate-bind9-py36 - parent: designate-bind9-py35 - nodeset: openstack-bionic-node - -- job: name: designate-devstack-base parent: legacy-dsvm-base vars: @@ -158,7 +153,6 @@ jobs: - designate-bind9 - designate-bind9-manager-model - - designate-bind9-py35 - designate-bind9-py36 - designate-devstack-pdns4 - designate-devstack-pdns4-postgres @@ -168,7 +162,6 @@ jobs: - designate-bind9 - designate-bind9-manager-model - - designate-bind9-py35 - designate-bind9-py36 - designate-devstack-pdns4 - designate-devstack-pdns4-postgres diff --git a/devstack/designate_plugins/backend-powerdns b/devstack/designate_plugins/backend-powerdns index f8db9f23..295ceccd 100644 --- a/devstack/designate_plugins/backend-powerdns +++ b/devstack/designate_plugins/backend-powerdns @@ -148,7 +148,7 @@ function init_designate_backend { # create_designate_pool_configuration_backend - Perform post-pool config tasks function create_designate_pool_configuration_backend { # Init and migrate designate_pdns database - designate-manage powerdns sync $DESIGNATE_POOL_ID + $DESIGNATE_BIN_DIR/designate-manage powerdns sync $DESIGNATE_POOL_ID } # start_designate_backend - start any external services diff --git a/devstack/plugin.sh b/devstack/plugin.sh index 37ed6e14..a0b91950 100755 --- a/devstack/plugin.sh +++ b/devstack/plugin.sh @@ -193,6 +193,8 @@ function create_designate_accounts { get_or_create_service "designate" "dns" "Designate DNS Service" get_or_create_endpoint "dns" \ "$REGION_NAME" \ + "$DESIGNATE_SERVICE_PROTOCOL://$DESIGNATE_SERVICE_HOST:$DESIGNATE_SERVICE_PORT/" \ + "$DESIGNATE_SERVICE_PROTOCOL://$DESIGNATE_SERVICE_HOST:$DESIGNATE_SERVICE_PORT/" \ "$DESIGNATE_SERVICE_PROTOCOL://$DESIGNATE_SERVICE_HOST:$DESIGNATE_SERVICE_PORT/" fi } @@ -200,7 +202,7 @@ function create_designate_accounts { # create_designate_pool_configuration - Create Pool Configuration function create_designate_pool_configuration { # Sync Pools Config - designate-manage pool update --file $DESIGNATE_CONF_DIR/pools.yaml + $DESIGNATE_BIN_DIR/designate-manage pool update --file $DESIGNATE_CONF_DIR/pools.yaml # Allow Backends to do backend specific tasks if function_exists create_designate_pool_configuration_backend; then @@ -223,14 +225,14 @@ function init_designate { recreate_database designate utf8 # Init and migrate designate database - designate-manage database sync + $DESIGNATE_BIN_DIR/designate-manage database sync if [ "$DESIGNATE_POOL_MANAGER_CACHE_DRIVER" == "sqlalchemy" ]; then # (Re)create designate_pool_manager cache recreate_database designate_pool_manager utf8 # Init and migrate designate pool-manager-cache - designate-manage pool-manager-cache sync + $DESIGNATE_BIN_DIR/designate-manage pool-manager-cache sync fi init_designate_backend @@ -337,7 +339,7 @@ if is_service_enabled designate; then install_designateclient echo_summary "Installing Designate" - install_designate + stack_install_service designate if is_service_enabled horizon; then echo_summary "Installing Designate dashboard" diff --git a/devstack/settings b/devstack/settings index d64faf77..68adfc22 100644 --- a/devstack/settings +++ b/devstack/settings @@ -13,7 +13,7 @@ DESIGNATE_POLL_INTERVAL=${DESIGNATE_POLL_INTERVAL:-5} DESIGNATE_POLL_RETRIES=${DESIGNATE_POLL_RETRIES:-6} # Quota Options -DESIGNATE_QUOTA_ZONES=${DESIGNATE_QUOTA_ZONES:-100} +DESIGNATE_QUOTA_ZONES=${DESIGNATE_QUOTA_ZONES:-10} DESIGNATE_QUOTA_ZONE_RECORDSETS=${DESIGNATE_QUOTA_ZONE_RECORDSETS:-500} DESIGNATE_QUOTA_ZONE_RECORDS=${DESIGNATE_QUOTA_ZONE_RECORDS:-500} DESIGNATE_QUOTA_RECORDSET_RECORDS=${DESIGNATE_QUOTA_RECORDSET_RECORDS:-20} @@ -39,9 +39,16 @@ DESIGNATE_SERVICE_PORT_DNS=${DESIGNATE_SERVICE_PORT_DNS:-53} DESIGNATE_SERVICE_PORT_MDNS=${DESIGNATE_SERVICE_PORT_MDNS:-5354} DESIGNATE_SERVICE_PORT_AGENT=${DESIGNATE_SERVICE_PORT_AGENT:-5358} -# Default directories -DESIGNATE_BIN_DIR=$(get_python_exec_prefix) DESIGNATE_DIR=$DEST/designate +# Default directories +# Support potential entry-points console scripts in VENV or not +if [[ ${USE_VENV} = True ]]; then + PROJECT_VENV["designate"]=${DESIGNATE_DIR}.venv + DESIGNATE_BIN_DIR=${PROJECT_VENV["designate"]}/bin +else + DESIGNATE_BIN_DIR=$(get_python_exec_prefix) +fi + DESIGNATEDASHBOARD_DIR=$DEST/designate-dashboard DESIGNATE_CONF_DIR=/etc/designate DESIGNATE_STATE_PATH=${DESIGNATE_STATE_PATH:=$DATA_DIR/designate} |