summaryrefslogtreecommitdiffstats
path: root/playbooks
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2016-10-24 09:19:04 -0400
committerGitHub <noreply@github.com>2016-10-24 09:19:04 -0400
commit6796a7b5bcfe391bf4affaf17c8b9a05a82be58f (patch)
tree3ad52f5b0112fc411ac4a52f9a9a1b3a1fc8e26a /playbooks
parentb5570b656e59756ad6ea5b24be253f15d0e3ca41 (diff)
parent9293059f5d331e26fc86c9fc841e2a57fcba8ae6 (diff)
downloadopenshift-6796a7b5bcfe391bf4affaf17c8b9a05a82be58f.tar.gz
openshift-6796a7b5bcfe391bf4affaf17c8b9a05a82be58f.tar.bz2
openshift-6796a7b5bcfe391bf4affaf17c8b9a05a82be58f.tar.xz
openshift-6796a7b5bcfe391bf4affaf17c8b9a05a82be58f.zip
Merge pull request #2573 from abutcher/infra-templates
Move infrastructure templates into openshift_hosted_templates role.
Diffstat (limited to 'playbooks')
-rw-r--r--playbooks/common/openshift-cluster/additional_config.yml2
-rw-r--r--playbooks/common/openshift-cluster/upgrades/post_control_plane.yml4
2 files changed, 6 insertions, 0 deletions
diff --git a/playbooks/common/openshift-cluster/additional_config.yml b/playbooks/common/openshift-cluster/additional_config.yml
index 26b31d313..825f46415 100644
--- a/playbooks/common/openshift-cluster/additional_config.yml
+++ b/playbooks/common/openshift-cluster/additional_config.yml
@@ -11,6 +11,8 @@
- role: openshift_examples
registry_url: "{{ openshift.master.registry_url }}"
when: openshift.common.install_examples | bool
+ - role: openshift_hosted_templates
+ registry_url: "{{ openshift.master.registry_url }}"
- role: openshift_manageiq
when: openshift.common.use_manageiq | bool
- role: cockpit
diff --git a/playbooks/common/openshift-cluster/upgrades/post_control_plane.yml b/playbooks/common/openshift-cluster/upgrades/post_control_plane.yml
index a3bc3abe3..2bbcbe1f8 100644
--- a/playbooks/common/openshift-cluster/upgrades/post_control_plane.yml
+++ b/playbooks/common/openshift-cluster/upgrades/post_control_plane.yml
@@ -17,10 +17,14 @@
# not already exist. We could have potentially done a replace --force to
# create and update in one step.
- openshift_examples
+ - openshift_hosted_templates
# Update the existing templates
- role: openshift_examples
registry_url: "{{ openshift.master.registry_url }}"
openshift_examples_import_command: replace
+ - role: openshift_hosted_templates
+ registry_url: "{{ openshift.master.registry_url }}"
+ openshift_hosted_templates_import_command: replace
pre_tasks:
- name: Collect all routers
command: >