Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Doc update and simple fixes #6

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Doc update and simple fixes #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c1a9c54
update readme_v2 to remove orchestrator=none
Mar 23, 2018
c78bb71
skip openstack controller eval when orch is k8
Mar 23, 2018
9d8fc07
include mandatory ssh_user var in instances.yaml
Mar 23, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions README_v2.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,9 +264,9 @@ ansible-playbook -i inventory/ playbooks/configure_instances.yml
```

Contrail installation:
orchestrator can be openstack (installs kolla) or none (for pure k8s installations) .
orchestrator can be openstack (installs kolla) or kubernetes (for pure k8s installations) .
```
ansible-playbook -e orchestrator=none|openstack -i inventory/ playbooks/install_contrail.yml
ansible-playbook -e orchestrator=kubernetes|openstack -i inventory/ playbooks/install_contrail.yml
```

The location of the configuration file (config/instances.yaml) can be changes
Expand Down
5 changes: 3 additions & 2 deletions config/instances.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ instances:
bms1:
provider: bms
ip: 192.168.1.100
ssh_user: root
contrail_configuration:
CONTAINER_REGISTRY: michaelhenkel
CONTRAIL_VERSION: ocata-5.0-20180219195722
CONTAINER_REGISTRY: opencontrailnightly
CONTRAIL_VERSION: latest
4 changes: 3 additions & 1 deletion playbooks/roles/install_contrail/tasks/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,9 @@
- name: add openstack controllers to the list
set_fact:
openstack_controller_list: "{{ openstack_controller_list + [ hostvars[item]['private_ip'] ] }}"
when: hostvars[item]['instance_data']['roles'].openstack is defined or hostvars[item]['instance_data']['roles'].openstack_control is defined
when:
- contrail_configuration.CLOUD_ORCHESTRATOR == 'openstack'
- hostvars[item]['instance_data']['roles'].openstack is defined or hostvars[item]['instance_data']['roles'].openstack_control is defined
with_items: "{{ groups['container_hosts'] }}"

- name: set KEYSTONE_AUTH_HOST
Expand Down