summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBogdan Dobrelya <bdobreli@redhat.com>2017-06-12 12:02:41 +0200
committerTomas Sedovic <tomas@sedovic.cz>2017-06-15 12:35:36 +0200
commitb884e6a9c77ae2d86b2de3c4ae6e8de558444610 (patch)
treed1c429241efaca8848e25ceeecbfbe769b992d38
parenta8719af95559926bcf4841197273dfe838a563a4 (diff)
downloadopenshift-b884e6a9c77ae2d86b2de3c4ae6e8de558444610.tar.gz
openshift-b884e6a9c77ae2d86b2de3c4ae6e8de558444610.tar.bz2
openshift-b884e6a9c77ae2d86b2de3c4ae6e8de558444610.tar.xz
openshift-b884e6a9c77ae2d86b2de3c4ae6e8de558444610.zip
Drop atomic-openshift-utils, update docs for origin
TODO use with when: ansible_distribution == 'CentOS' Also update docs for origin Signed-off-by: Bogdan Dobrelya <bdobreli@redhat.com>
-rw-r--r--playbooks/provisioning/openstack/README.md11
-rw-r--r--roles/openshift-prep/tasks/prerequisites.yml3
2 files changed, 11 insertions, 3 deletions
diff --git a/playbooks/provisioning/openstack/README.md b/playbooks/provisioning/openstack/README.md
index fb2053c25..c319791c9 100644
--- a/playbooks/provisioning/openstack/README.md
+++ b/playbooks/provisioning/openstack/README.md
@@ -96,6 +96,12 @@ The full list of options is available in this sample inventory:
https://github.com/openshift/openshift-ansible/blob/master/inventory/byo/hosts.ose.example
+Note, that in order to deploy OpenShift origin, you should update the following
+variables for the `inventory/group_vars/OSEv3.yml`, `all.yml`:
+
+ deployment_type: origin
+ origin_release: 1.5.1
+ openshift_deployment_type: "{{ deployment_type }}"
## Deployment
@@ -111,8 +117,11 @@ file, this is how you stat the provisioning process:
Once it succeeds, you can install openshift by running:
- ansible-playbook --timeout 30 --become --user openshift --private-key ~/.ssh/openshift -i inventory/ openshift-ansible/playbooks/byo/config.yml
+ ansible-playbook --become --user openshift --private-key ~/.ssh/openshift -i inventory/ openshift-ansible/playbooks/byo/openshift-node/network_manager.yml
+ ansible-playbook --become --user openshift --private-key ~/.ssh/openshift -i inventory/ openshift-ansible/playbooks/byo/config.yml
+Note, the `network_manager.yml` is only required if you're deploying OpenShift
+origin.
## License
diff --git a/roles/openshift-prep/tasks/prerequisites.yml b/roles/openshift-prep/tasks/prerequisites.yml
index 1286905f4..60507636f 100644
--- a/roles/openshift-prep/tasks/prerequisites.yml
+++ b/roles/openshift-prep/tasks/prerequisites.yml
@@ -1,7 +1,7 @@
---
- name: "Cleaning yum repositories"
command: "yum clean all"
-
+
- name: "Install required packages"
yum:
name: "{{ item }}"
@@ -13,7 +13,6 @@
- bind-utils
- bridge-utils
- bash-completion
- - atomic-openshift-utils
- vim-enhanced
- name: "Update all packages (this can take a very long time)"