diff --git a/Makefile b/Makefile index 7fa74d09a..236c280ab 100644 --- a/Makefile +++ b/Makefile @@ -91,6 +91,7 @@ docs: docs-dependencies docs-user-all-variants docs-dev ## Build documentation docs-user-all-variants: cd docs_user; BUILD=upstream $(MAKE) html cd docs_user; BUILD=downstream $(MAKE) html + cd docs_user; BUILD=downstream BUILD_VARIANT=ospdo $(MAKE) html docs-user: cd docs_user; $(MAKE) html diff --git a/docs_user/Makefile b/docs_user/Makefile index f5b32ec5d..6b8a37a62 100644 --- a/docs_user/Makefile +++ b/docs_user/Makefile @@ -1,10 +1,12 @@ BUILD ?= upstream +BUILD_VARIANT ?= +BUILD_VARIANT_WITH_SEPARATOR ?= $(if $(strip $(BUILD_VARIANT)),-$(BUILD_VARIANT),) BUILD_DIR = ../docs_build ROOTDIR = $(realpath .) NAME = adoption-user DEST_DIR = $(BUILD_DIR)/$(NAME) -DEST_HTML = $(DEST_DIR)/index-$(BUILD).html -DEST_PDF = $(BUILD_DIR)/$(NAME)-$(BUILD).pdf +DEST_HTML = $(DEST_DIR)/index-$(BUILD)$(BUILD_VARIANT_WITH_SEPARATOR).html +DEST_PDF = $(BUILD_DIR)/$(NAME)-$(BUILD)$(BUILD_VARIANT_WITH_SEPARATOR).pdf IMAGES_DIR = $(DEST_DIR)/images IMAGES_TS = $(DEST_DIR)/.timestamp-images MAIN_SOURCE = main.adoc @@ -56,7 +58,7 @@ $(IMAGES_TS): $(IMAGES) touch $(IMAGES_TS) $(DEST_HTML): $(ALL_SOURCES) - $(BUNDLE_EXEC) asciidoctor -a source-highlighter=highlightjs -a highlightjs-languages="yaml,bash" -a highlightjs-theme="monokai" --failure-level WARN -a build=$(BUILD) -b xhtml5 -d book -o $@ $(MAIN_SOURCE) + $(BUNDLE_EXEC) asciidoctor -a source-highlighter=highlightjs -a highlightjs-languages="yaml,bash" -a highlightjs-theme="monokai" --failure-level WARN -a build=$(BUILD) -a build_variant=$(BUILD_VARIANT) -b xhtml5 -d book -o $@ $(MAIN_SOURCE) $(DEST_PDF): $(ALL_SOURCES) - $(BUNDLE_EXEC) asciidoctor-pdf -a build=$(BUILD) -d book -o $@ $(MAIN_SOURCE) $(IMAGES) + $(BUNDLE_EXEC) asciidoctor-pdf -a build=$(BUILD) -a build_variant=$(BUILD_VARIANT) -d book -o $@ $(MAIN_SOURCE) $(IMAGES) diff --git a/docs_user/adoption-attributes.adoc b/docs_user/adoption-attributes.adoc index 73277a3c9..38b09dab6 100644 --- a/docs_user/adoption-attributes.adoc +++ b/docs_user/adoption-attributes.adoc @@ -149,6 +149,11 @@ ifeval::["{build}" == "downstream"] :telemetry: Telemetry service endif::[] +ifeval::["{build}-{build_variant}" == "downstream-ospdo"] +:OpenStackPreviousInstaller: director_operator +endif::[] + + // Common URLs. Do not override. Do not delete. :base_url: https://access.redhat.com/documentation :defaultURL: https://docs.redhat.com/en/documentation/red_hat_openstack_services_on_openshift/{rhos_curr_ver}/html