Skip to content

Merge master into dev + fixes.#53

Merged
jwmatthews merged 7 commits into
fusor:masterfrom
cfchase:merge-master-dev
Jun 1, 2017
Merged

Merge master into dev + fixes.#53
jwmatthews merged 7 commits into
fusor:masterfrom
cfchase:merge-master-dev

Conversation

@cfchase
Copy link
Copy Markdown
Contributor

@cfchase cfchase commented May 26, 2017

Merged in master to dev branch and reverted commit that uses summit code.

cfchase and others added 7 commits May 15, 2017 18:48
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
* master:
  Change to pip install docker instead of the older docker-py (#50)
  README tweak
  Update README for 2 local directories
  Adds macOS support for local environment (#49)
  Updated to use summit labels (#47)
@cfchase cfchase requested a review from jwmatthews May 26, 2017 17:17
@cfchase
Copy link
Copy Markdown
Contributor Author

cfchase commented May 26, 2017

I've tested linux and ec2. If someone could look/test out mac, that would be very helpful.

@cfchase cfchase requested a review from johnkim76 May 30, 2017 17:24
@jwmatthews
Copy link
Copy Markdown
Member

Ran on mac and saw an issue:

TASK [ansible_service_broker_setup : set_fact] ************************************************************************************************************************
ok: [localhost]

TASK [ansible_service_broker_setup : uri] *****************************************************************************************************************************
fatal: [localhost]: FAILED! => {"failed": true, "msg": "The conditional check 'not response.json or not response.json.SpecCount or response.json.SpecCount == 0' failed. The error was: error while evaluating conditional (not response.json or not response.json.SpecCount or response.json.SpecCount == 0): 'dict object' has no attribute 'SpecCount'"}
to retry, use: --limit @/git/fusor/catasb/ansible/reset_mac_environment.retry

PLAY RECAP ************************************************************************************************************************************************************
localhost : ok=74 changed=44 unreachable=0 failed=1

real 4m30.898s
user 0m33.905s
sys 0m12.913s

Yet when I try the route it looks good:

$ curl -X POST http://asb-1338-ansible-service-broker.192.168.37.1.nip.io/v2/bootstrap
{
"spec_count": 8,
"image_count": 10
}

I will debug more on my end, but might not have the time till Friday.

@jwmatthews
Copy link
Copy Markdown
Member

Retested today and had success.

Ran through the postgres + python webapp demo on macOS with this PR.

Copy link
Copy Markdown
Member

@jwmatthews jwmatthews left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good, had success.

Thanks Chris for doing this.

@jwmatthews
Copy link
Copy Markdown
Member

ACK

@jwmatthews jwmatthews merged commit a9d8112 into fusor:master Jun 1, 2017
@cfchase cfchase mentioned this pull request Jun 1, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants