Skip to content

Minor tweaks found when trying to use with digitalrebar #42

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

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

Minor tweaks found when trying to use with digitalrebar #42

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
2eecc08
Add a way to override the arp vrouter case for google.
galthaus Feb 13, 2016
b7de0b6
Only set if there and not empty
galthaus Feb 13, 2016
4bf2fc4
Use ansible_nodename instead of ansible_hostname.
galthaus Feb 13, 2016
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
2 changes: 1 addition & 1 deletion roles/opencontrail/templates/contrail-control.conf.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[DEFAULT]
hostip={{ opencontrail_host_address }}
hostname={{ ansible_hostname }}
hostname={{ ansible_nodename }}

[IFMAP]
server_url=https://localhost:{{ opencontrail_master_ifmap_port if opencontrail_master_ifmap_port is defined else 8443 }}
Expand Down
3 changes: 3 additions & 0 deletions roles/opencontrail/templates/contrail-vrouter-agent.conf.gateway.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@ physical_interface={{ opencontrail_host_interface }}
{% if opencontrail_host_gateway -%}
gateway={{ opencontrail_host_gateway }}
{% endif -%}
{% if opencontrail_no_arp -%}
subnet_hosts_resolvable=0
{% endif -%}

{% if opencontrail_public_subnet is defined %}
[GATEWAY-0]
Expand Down
3 changes: 3 additions & 0 deletions roles/opencontrail/templates/contrail-vrouter-agent.conf.node.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@ physical_interface={{ opencontrail_host_interface }}
{% if opencontrail_host_gateway -%}
gateway={{ opencontrail_host_gateway }}
{% endif -%}
{% if opencontrail_no_arp -%}
subnet_hosts_resolvable=0
{% endif -%}

[HYPERVISOR]
type=kvm
4 changes: 2 additions & 2 deletions roles/opencontrail/templates/kube-network.conf.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ service-cluster-ip-range = {{ opencontrail_all_service_addresses }}

[opencontrail]
public-ip-range = {{ opencontrail_public_subnet }}
{% if opencontrail_private_subnet is defined %}
{% if opencontrail_private_subnet is defined and opencontrail_private_subnet != "" %}
private-ip-range = {{ opencontrail_private_subnet }}
{% endif %}
cluster-service = {{ opencontrail_cluster_services_namespace }}/default
{% if openshift is defined -%}
network-label = opencontrail.org/name
service-label = opencontrail.org/services
{% endif -%}
{% endif -%}
5 changes: 4 additions & 1 deletion roles/opencontrail/vars/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,7 @@ opencontrail_host_kernel_devel: "{{ ansible_kernel | regex_replace('([0-9.]+)-([

opencontrail_host_kernel_build_dir: "/tmp/.ansible/build/{{ opencontrail_host_kernel_tag }}"
opencontrail_host_kernel_install_dir: "/tmp/.ansible/install/{{ opencontrail_host_kernel_tag }}"
opencontrail_host_kernel_artifact_tar: "/tmp/.ansible/opencontrail-vrouter-{{ opencontrail_host_kernel_tag }}.tgz"
opencontrail_host_kernel_artifact_tar: "/tmp/.ansible/opencontrail-vrouter-{{ opencontrail_host_kernel_tag }}.tgz"

# Allow the system to have a way to override arp discovery of vrouters
opencontrail_no_arp: false
Copy link

@pedro-r-marques pedro-r-marques Feb 18, 2016

Choose a reason for hiding this comment

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

I'd prefer if this parameter was called:
opencontrail_physical_network_arp_support
with a default of true.

Copy link
Author

@galthaus galthaus Feb 18, 2016

Choose a reason for hiding this comment

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

Sounds good

Sent from my iPhone

On Feb 17, 2016, at 6:09 PM, Pedro Marques [email protected] wrote:

In roles/opencontrail/vars/main.yml:

\ No newline at end of file
+opencontrail_host_kernel_artifact_tar: "/tmp/.ansible/opencontrail-vrouter-{{ opencontrail_host_kernel_tag }}.tgz"
+
+# Allow the system to have a way to override arp discovery of vrouters
+opencontrail_no_arp: false
I'd prefer if this parameter was called:
opencontrail_physical_network_arp_support
with a default of true.

—
Reply to this email directly or view it on GitHub.

2 changes: 1 addition & 1 deletion roles/opencontrail_provision/tasks/master.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,5 +78,5 @@
command: >
docker run --net=host opencontrail/config:2.20 /usr/share/contrail-utils/provision_control.py
--api_server_ip localhost --api_server_port 8082
--host_name "{{ ansible_hostname }}" --host_ip "{{ opencontrail_host_address }}"
--host_name "{{ ansible_nodename }}" --host_ip "{{ opencontrail_host_address }}"
--router_asn 64512 --oper add
2 changes: 1 addition & 1 deletion roles/opencontrail_provision/tasks/nodes.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
command: >
docker run --net=host opencontrail/config:2.20 /usr/share/contrail-utils/provision_vrouter.py
--api_server_ip localhost
--host_name "{{ ansible_hostname }}{% if hostvars[inventory_hostname]['ansible_domain'] != "" %}.{{ hostvars[inventory_hostname]['ansible_domain'] }}{% endif %}"
--host_name "{{ ansible_nodename }}"
--host_ip "{{ opencontrail_host_address }}"
delegate_to: "{{ groups['masters'][0] }}"