summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2017-12-05 08:43:00 -0500
committerGitHub <noreply@github.com>2017-12-05 08:43:00 -0500
commit351785e4c44101fb109f03ac4aedbddd86faaa72 (patch)
treea2b8845cde08526949e220b830b100bc66a7e0f7
parent5a7b6beed127607f75a6c1128152da89ce01eca7 (diff)
parent87b7d5aa3f088c34cb8533046329180b15fcbc54 (diff)
downloadopenshift-351785e4c44101fb109f03ac4aedbddd86faaa72.tar.gz
openshift-351785e4c44101fb109f03ac4aedbddd86faaa72.tar.bz2
openshift-351785e4c44101fb109f03ac4aedbddd86faaa72.tar.xz
openshift-351785e4c44101fb109f03ac4aedbddd86faaa72.zip
Merge pull request #6345 from bogdando/openstack_openshift_testing_repos
Use openshift testing repos for openstack
-rw-r--r--playbooks/openstack/README.md9
-rw-r--r--playbooks/openstack/sample-inventory/group_vars/OSEv3.yml2
2 files changed, 9 insertions, 2 deletions
diff --git a/playbooks/openstack/README.md b/playbooks/openstack/README.md
index c762169eb..ff0b7adc7 100644
--- a/playbooks/openstack/README.md
+++ b/playbooks/openstack/README.md
@@ -24,7 +24,7 @@ The OpenStack release must be Newton (for Red Hat OpenStack this is
version 10) or newer. It must also satisfy these requirements:
* Heat (Orchestration) must be available
-* The deployment image (CentOS 7 or RHEL 7) must be loaded
+* The deployment image (CentOS 7.4 or RHEL 7) must be loaded
* The deployment flavor must be available to your user
- `m1.medium` / 4GB RAM + 40GB disk should be enough for testing
- look at
@@ -183,9 +183,14 @@ Then run the provision + install playbook -- this will create the OpenStack
resources:
```bash
-$ ansible-playbook --user openshift -i inventory openshift-ansible/playbooks/openstack/openshift-cluster/provision_install.yaml
+$ ansible-playbook --user openshift -i inventory \
+ openshift-ansible/playbooks/openstack/openshift-cluster/provision_install.yaml \
+ -e openshift_repos_enable_testing=true
```
+Note, you may want to use the testing repo for development purposes only.
+Normally, `openshift_repos_enable_testing` should not be specified.
+
If you're using multiple inventories, make sure you pass the path to
the right one to `-i`.
diff --git a/playbooks/openstack/sample-inventory/group_vars/OSEv3.yml b/playbooks/openstack/sample-inventory/group_vars/OSEv3.yml
index 90608bbc0..68d898d9a 100644
--- a/playbooks/openstack/sample-inventory/group_vars/OSEv3.yml
+++ b/playbooks/openstack/sample-inventory/group_vars/OSEv3.yml
@@ -1,5 +1,7 @@
---
+## Openshift product versions and repos to install from
openshift_deployment_type: origin
+#openshift_repos_enable_testing: true
#openshift_deployment_type: openshift-enterprise
#openshift_release: v3.5
openshift_master_default_subdomain: "apps.{{ openshift_openstack_clusterid }}.{{ openshift_openstack_public_dns_domain }}"