Merge pull request #252 from cmgrote/main

Changes configuration ordering to address quirk found in #246
odpi · Oct 13, 2021 · 9e2fac1 · 9e2fac1
2 parents f0f7ef7 + 96a54a1
commit 9e2fac1
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/cts/charts/ec-ha-xtdb/bin/bootstrapConfig.sh b/cts/charts/ec-ha-xtdb/bin/bootstrapConfig.sh
@@ -8,7 +8,7 @@ curl -f -k -w "\n  (%{http_code} - %{url_effective})\n" --silent -X POST ${PTS_E
 curl -f -k -w "\n  (%{http_code} - %{url_effective})\n" --silent -X POST ${PTS_ENDPOINT}/open-metadata/admin-services/users/${EGERIA_USER}/servers/${XTDB_SERVER}/server-type?typeName=XTDB
 curl -f -k -w "\n  (%{http_code} - %{url_effective})\n" --silent -X POST ${PTS_ENDPOINT}/open-metadata/admin-services/users/${EGERIA_USER}/servers/${XTDB_SERVER}/organization-name?name=ODPi
 curl -f -k -w "\n  (%{http_code} - %{url_effective})\n" --silent -X POST --header "Content-Type: application/json" ${PTS_ENDPOINT}/open-metadata/admin-services/users/${EGERIA_USER}/servers/${XTDB_SERVER}/event-bus?topicURLRoot=egeria --data '{"producer": {"bootstrap.servers": "'"${KAFKA_ENDPOINT}"'"}, "consumer": {"bootstrap.servers": "'"${KAFKA_ENDPOINT}"'"} }'
-curl -f -k -w "\n  (%{http_code} - %{url_effective})\n" --silent -X POST --header "Content-Type: application/json" ${PTS_ENDPOINT}/open-metadata/admin-services/users/${EGERIA_USER}/servers/${XTDB_SERVER}/local-repository/mode/plugin-repository/connection --data '{"class":"Connection","connectorType":{"class":"ConnectorType","connectorProviderClassName":"org.odpi.egeria.connectors.juxt.xtdb.repositoryconnector.XtdbOMRSRepositoryConnectorProvider"},"configurationProperties":{"xtdbConfigEDN":"{:xtdb/index-store {:kv-store {:xtdb/module xtdb.lmdb/->kv-store :db-dir \"data/servers/xtdb/lmdb-index\"}} :kafka-config {:xtdb/module xtdb.kafka/->kafka-config :bootstrap-servers \"'"${KAFKA_ENDPOINT}"'\"} :xtdb/document-store {:xtdb/module xtdb.jdbc/->document-store :connection-pool {:dialect {:xtdb/module xtdb.jdbc.psql/->dialect} :pool-opts {:maximumPoolSize 10} :db-spec {:jdbcUrl \"'"${JDBC_URL}"'?user='"${username}"'&password='"${password}"'\"}}} :xtdb/tx-log {:xtdb/module xtdb.kafka/->tx-log :kafka-config :kafka-config :tx-topic-opts {:topic-name \"xtdb-tx-log\"} :poll-wait-duration \"PT0.050S\"} :xtdb.lucene/lucene-store {:db-dir \"data/servers/xtdb/lucene\" :indexer {:xtdb/module xtdb.lucene.egeria/->egeria-indexer} :analyzer {:xtdb/module xtdb.lucene.egeria/->ci-analyzer}}}","syncIndex":true}}'
+curl -f -k -w "\n  (%{http_code} - %{url_effective})\n" --silent -X POST --header "Content-Type: application/json" ${PTS_ENDPOINT}/open-metadata/admin-services/users/${EGERIA_USER}/servers/${XTDB_SERVER}/local-repository/mode/plugin-repository/connection --data '{"class":"Connection","connectorType":{"class":"ConnectorType","connectorProviderClassName":"org.odpi.egeria.connectors.juxt.xtdb.repositoryconnector.XtdbOMRSRepositoryConnectorProvider"},"configurationProperties":{"xtdbConfigEDN":"{:xtdb/index-store {:kv-store {:xtdb/module xtdb.lmdb/->kv-store :db-dir \"data/servers/xtdb/lmdb-index\"}} :kafka-config {:xtdb/module xtdb.kafka/->kafka-config :bootstrap-servers \"'"${KAFKA_ENDPOINT}"'\"} :xtdb/tx-log {:xtdb/module xtdb.kafka/->tx-log :kafka-config :kafka-config :tx-topic-opts {:topic-name \"xtdb-tx-log\"} :poll-wait-duration \"PT0.050S\"} :xtdb.lucene/lucene-store {:db-dir \"data/servers/xtdb/lucene\" :indexer {:xtdb/module xtdb.lucene.egeria/->egeria-indexer} :analyzer {:xtdb/module xtdb.lucene.egeria/->ci-analyzer}} :xtdb/document-store {:xtdb/module xtdb.jdbc/->document-store :connection-pool {:dialect {:xtdb/module xtdb.jdbc.psql/->dialect} :pool-opts {:maximumPoolSize 10} :db-spec {:jdbcUrl \"'"${JDBC_URL}"'?user='"${username}"'&password='"${password}"'\"}}}}","syncIndex":true}}'
 curl -f -k -w "\n  (%{http_code} - %{url_effective})\n" --silent -X POST ${PTS_ENDPOINT}/open-metadata/admin-services/users/${EGERIA_USER}/servers/${XTDB_SERVER}/cohorts/${EGERIA_COHORT}
 
 echo "Retrieving common configuration from PTS endpoint: ${PTS_ENDPOINT}..."