Merge "Revert "Revert "Move to openshift-ansible 3.10"""

openstack-archive · Sep 6, 2018 · 6c7340d · 6c7340d
2 parents 61b8592 + 706981b
commit 6c7340d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/config/general_config/featureset033.yml b/config/general_config/featureset033.yml
@@ -13,12 +13,12 @@ undercloud_generate_service_certificate: false
 # This enables the deployment of the overcloud with SSL.
 ssl_overcloud: false
 
-# Centos OpenSihft repo
+# Centos OpenShift repo
 add_repos:
   - type: package
-    # NOTE(mandre) centos-release-openshift-origin39 provides the newest
-    # packages for 3.9 branch
-    pkg_name: centos-release-openshift-origin39
+    # NOTE(mandre) centos-release-openshift-origin310 provides the newest
+    # packages for 3.10 branch
+    pkg_name: centos-release-openshift-origin310
   - type: generic
     reponame: quickstart-centos-virt-container
     filename: quickstart-centos-virt-container.repo

diff --git a/config/release/tripleo-ci/master.yml b/config/release/tripleo-ci/master.yml
@@ -19,6 +19,7 @@ dlrn_hash_tag_newest: current
 docker_registry_host: docker.io
 docker_registry_namespace: tripleomaster
 docker_image_tag: "{{ dlrn_hash|default(dlrn_hash_tag) }}"
+docker_openshift_tag: v3.10.0
 overcloud_image_url: https://images.rdoproject.org/master/rdo_trunk/current-tripleo/overcloud-full.tar
 ipa_image_url: https://images.rdoproject.org/master/rdo_trunk/current-tripleo/ironic-python-agent.tar
 repo_cmd_before: |