Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Fix issues with vcenter_manager role
Removed some unnecessary steps from create_vcenter_manager.
Fix a bug in create_vcenter_manager. Should copy env values properly
now.

Closes-Bug: #1775827
Depends-On: Ibbf2c2092a8d62110519db5c54be9a75daa2d086
Change-Id: I3fe0a78e9b18d6befbd4fa03ba1b2defb077b6b0
  • Loading branch information
aszc-dev committed Jun 12, 2018
1 parent de6d1ed commit 47be02c
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 45 deletions.
40 changes: 7 additions & 33 deletions playbooks/roles/install_contrail/tasks/create_vcenter_manager.yml
Expand Up @@ -5,37 +5,6 @@
state: directory
recurse: yes

- name: set vcenter url if defined
set_fact:
vcenter_server: "{{ contrail_configuration.VCENTER_SERVER }}"
when: contrail_configuration.VCENTER_SERVER is defined

- name: set vcenter port if defined
set_fact:
vcenter_server: "{{ contrail_configuration.VCENTER_SERVER }}"
when: contrail_configuration.VCENTER_PORT is defined

- name: set vcenter username if defined
set_fact:
vcenter_username: "{{ contrail_configuration.VCENTER_USERNAME }}"
when: contrail_configuration.VCENTER_USERNAME is defined

- name: set vcenter password if defined
set_fact:
vcenter_password: "{{ contrail_configuration.VCENTER_PASSWORD }}"
when: contrail_configuration.VCENTER_PASSWORD is defined

- name: set vcenter datacenter if defined
set_fact:
vcenter_datacenter: "{{ contrail_configuration.VCENTER_DATACENTER }}"
when: contrail_configuration.VCENTER_DATACENTER is defined

- name: set esxi datacenter if defined
set_fact:
vcenter_datacenter: "{{ contrail_configuration.VCENTER_DATACENTER }}"
when: contrail_configuration.ESXI is defined


- name: "get /etc/contrail/common_vcmanager.env stat"
stat:
path: "/etc/contrail/common_vcmanager.env"
Expand All @@ -59,11 +28,16 @@

- name: "populate pod specific common_vcmanager.env"
lineinfile: dest=/etc/contrail/common_vcmanager.env regexp='.*{{ item.key }}$' line="{{ item.key }}={{ item.value }}" state=present
with_dict: "{{ roles[inventory_hostname].vcenter_manager }} | default ({})"
when: roles[inventory_hostname].vcenter_manager.key is defined
with_dict: "{{ roles[instance_name].vcenter_manager }}"
ignore_errors: yes
no_log: True

- name: add ESXI_HOST to common_vcmanager.env
lineinfile:
dest: /etc/contrail/common_vcmanager.env
regexp: '.*ESXI_HOST$'
line: "ESXI_HOST={{ instances[instance_name].esxi_host }}"

- name: update image
shell: "docker pull {{ container_registry }}/{{ item }}:{{ contrail_version_tag }}"
with_items:
Expand Down
Expand Up @@ -4,20 +4,8 @@ services:
image: "{{ container_registry }}/contrail-vcenter-manager:{{ contrail_version_tag }}"
network_mode: "host"
env_file: /etc/contrail/common_vcmanager.env
environment:
- VCENTER_SERVER={{ vcenter_server }}
- VCENTER_USERNAME={{ vcenter_username }}
- VCENTER_PASSWORD={{ vcenter_password }}
- VCENTER_DATACENTER={{ vcenter_datacenter }}
- ESXI_HOST={{ esxi_host }}
- ESXI_USERNAME={{ esxi_username }}
- ESXI_PASSWORD={{ esxi_password }}
- ESXI_DATACENTER={{ esxi_datacenter }}

volumes:
- /var/log/contrail:/var/log/contrail
restart: on-failure
stdin_open: {{ stdin_open }}
tty: {{ tty }}


0 comments on commit 47be02c

Please sign in to comment.