Merge dev into master #87
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Set reset variable based on script. Removed some unneeded demo specific vars. Added source of my_vars for user specific variables.
* Add prompts for dockerhub credentials, make my_vars file optional, add support for arbitrary ansible arguments when executing local setup * update reset_environmnent, add support for my_vars.yml
* minor formatting for README files * update as suggested by @jmrodri encapsulate shell commands and examples with a ```
* Updated to use summit labels (#47) * Adds macOS support for local environment (#49) * Successful run local on macOS, postgres/python bind worked. * Reverted asbcli up to use openshift_url variable * Update README * Add note 'socat' needs to be installed on mac * Fix for install asb pip requirements * Update README for 2 local directories * README tweak * Change to pip install docker instead of the older docker-py (#50) * Revert "Updated to use summit labels (#47)" This reverts commit 3c7e187. * Minor fixes necessary after merging master. * Adapting vars_prompt to ec2 and mac.
* Integrate templates into the playbooks Instead of using asbcli to create the broker, use templates and render them with jinja2. * Updates from testing * Remove the Ansible Service Broker APB as we do not use it for deploying now
…lows us to use devel broker images easier (#60)
Fixes issue we saw with macOS and 'latest' origin images
* launch_apb_on_bind and output_request
Updated all other top level playbooks to place env_hacks to be after openshift setup
* Consolidate local playbooks * Moved variable.yml files into a config folder. Updated README.
* Use oc cluster up --service-catalog=true instead of separate service catalog setup. * Fix to use oc and not the older service catalog config * Update openshift config to use openshift_hostname also removed some unused pieces from the service catalog apiserver now being behind the api aggregator
Get latest release of oc client from OpenShift Builds
* dev: (30 commits) Get latest release of oc client from OpenShift Builds (#84) Enable service-catalog using oc cluster up option (#83) Tweak to remove_all_synced_docker_images.sh Remove all local images Updated --rcm to use latest rcm built images for openshift (#82) Use prebuilt binary stored in s3 for oc client. (#81) Added troubleshooting to README (#79) Fixed macOS to use setup_local_environment.yml add rcm option and source repetitive code (#75) Consolidate local playbooks (#73) Added broker relist interval variable to controller manager deployment (#76) Allow changing etcd image and path to support downstream (#74) adding recovery config values (#72) Fix for persistent volume cleanup on mac (#70) Add config options (#71) Recreate PV mount to avoid permissions issues on pvs. (#69) Use openshift template to deploy Ansible Service Broker (#65) Enable pod presets (#67) Bump to using v3.6.0-alpha.2 for 'oc' executable (#64) Change service catalog/apiserver to canary for testing in dev (#63) ...
|
For merging this one, let's create a merge commit. |
|
Merge commit enabled by the repo |
|
successfully tested in Linux environment |
|
ACK |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Merged dev into master: 1d07987
Fixed failure if error on checking oc version: d0ecfdb
Added note for Summit 2017: cce9206