소스 검색

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>
Bogdan Dobrelya 7 년 전
부모
커밋
b884e6a9c7
2개의 변경된 파일11개의 추가작업 그리고 3개의 파일을 삭제
  1. 10 1
      playbooks/provisioning/openstack/README.md
  2. 1 2
      roles/openshift-prep/tasks/prerequisites.yml

+ 10 - 1
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
 

+ 1 - 2
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)"