Use proper schema for content_origin in examples

fixes #7798 https://pulp.plan.io/issues/7798
pulp · Nov 5, 2020 · 7320aee · 7320aee
1 parent 9b56554
commit 7320aee
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/CHANGES/7798.doc b/CHANGES/7798.doc
@@ -0,0 +1 @@
+Configured `content_origin' to properly choose between `http` and `https` in the example playbooks as well as the vagrant playbooks.
diff --git a/playbooks/example-source/group_vars/all b/playbooks/example-source/group_vars/all
@@ -30,4 +30,4 @@ developer_user_home: /var/lib/pulp
 developer_user: pulp
 pulp_settings:
   secret_key: secret
-  content_origin: "https://{{ ansible_fqdn }}"
+  content_origin: "{{ pulp_webserver_disable_https | default(false) | ternary('http', 'https') }}://{{ ansible_fqdn }}"
diff --git a/playbooks/example-use/group_vars/all b/playbooks/example-use/group_vars/all
@@ -15,4 +15,4 @@ pulp_install_plugins:
   # pulp-rpm: {}
 pulp_settings:
   secret_key: secret
-  content_origin: "https://{{ ansible_fqdn }}"
+  content_origin: "{{ pulp_webserver_disable_https | default(false) | ternary('http', 'https') }}://{{ ansible_fqdn }}"