diff options
| author | Colin Walters <walters@verbum.org> | 2015-10-29 12:51:34 -0400 | 
|---|---|---|
| committer | Colin Walters <walters@verbum.org> | 2015-10-29 12:51:34 -0400 | 
| commit | 9e1a8c8e9c56e81f21e09b98c65e1c4c6f30d5f0 (patch) | |
| tree | 15794f03503704cda94d3c621138863214948043 | |
| parent | 9bc5a8982044fdc614dbc5c8e69d52ecea542eaf (diff) | |
README_AEP: Various fixes
- Fix deployment_type to be atomic-enterpri
- Note in oreg_url that the names may change
- Drop the COPR as it doesn't apply for AEP right now
- The `openshift_additional_repos` needs to be on a single line
  or Ansible will error out (with `ansible-1.9.2-1.el7` at least)
- Change the hostnames to be `aep` to be clearer what we have
- We no longer have a separate git repository
| -rw-r--r-- | README_AEP.md | 27 | 
1 files changed, 9 insertions, 18 deletions
diff --git a/README_AEP.md b/README_AEP.md index e29888617..d22ce969d 100644 --- a/README_AEP.md +++ b/README_AEP.md @@ -76,39 +76,30 @@ ansible_ssh_user=root  # If ansible_ssh_user is not root, ansible_sudo must be set to true  #ansible_sudo=true -# To deploy origin, change deployment_type to origin -deployment_type=enterprise +# See DEPLOYMENT_TYPES.md +deployment_type=atomic-enterprise -# Pre-release registry URL -oreg_url=docker-buildvm-rhose.usersys.redhat.com:5000/openshift3/ose-${component}:${version} +# Pre-release registry URL; note that in the future these images  +# may have an atomicenterprise/aep- prefix or so. +oreg_url=rcm-img-docker01.build.eng.bos.redhat.com:5001/openshift3/ose-${component}:${version}  # Pre-release additional repo -openshift_additional_repos=[{'id': 'ose-devel', 'name': 'ose-devel', -'baseurl': -'http://buildvm-devops.usersys.redhat.com/puddle/build/OpenShiftEnterprise/3.0/latest/RH7-RHOSE-3.0/$basearch/os', -'enabled': 1, 'gpgcheck': 0}] - -# Origin copr repo -#openshift_additional_repos=[{'id': 'openshift-origin-copr', 'name': -'OpenShift Origin COPR', 'baseurl': -'https://copr-be.cloud.fedoraproject.org/results/maxamillion/origin-next/epel-7-$basearch/', -'enabled': 1, 'gpgcheck': 1, gpgkey: -'https://copr-be.cloud.fedoraproject.org/results/maxamillion/origin-next/pubkey.gpg'}] +openshift_additional_repos=[{'id': 'ose-devel', 'name': 'ose-devel', 'baseurl': 'http://buildvm-devops.usersys.redhat.com/puddle/build/AtomicOpenShift/3.1/2015-10-27.1', 'enabled': 1, 'gpgcheck': 0}]  # host group for masters  [masters] -ose3-master.example.com +aep3-master.example.com  # host group for nodes  [nodes] -ose3-node[1:2].example.com +aep3-node[1:2].example.com  ```  The hostnames above should resolve both from the hosts themselves and  the host where ansible is running (if different).  ## Running the ansible playbooks -From the atomic-enterprise-ansible checkout run: +From the openshift-ansible checkout run:  ```sh  ansible-playbook playbooks/byo/config.yml  ```  | 
