CORD-912
OpenCloud support
Change-Id: I170597cacd76c84c795a7bf4c8e77e068ebcd72a
diff --git a/roles/compute-node-config/defaults/main.yml b/roles/compute-node-config/defaults/main.yml
index dffca62..cfbaa76 100644
--- a/roles/compute-node-config/defaults/main.yml
+++ b/roles/compute-node-config/defaults/main.yml
@@ -1,12 +1,16 @@
---
# compute-node-config/defaults/main.yml
+# default site/deployment placeholder names
+site_name: sitename
+deployment_type: deploymenttype
+
# location of cord_profile on head node
head_cord_profile_dir: /opt/cord_profile
-# name of the external interface on compute nodes. Should have the ansible_ prefix.
+# name of the external interface on compute nodes
# `fabric` is default in R-CORD
-compute_external_interface: ansible_fabric
+compute_external_interface: fabric
# service configs referenced here are likely located in cord-profile/templates
# used in openstack-compute-vtn.yaml.j2, referencing network in management-net.yaml.j2
@@ -16,4 +20,3 @@
# used in openstack-compute-vtn.yaml.j2, referencing service in fabric.yaml.j2
use_fabric: False
-
diff --git a/roles/compute-node-config/templates/openstack-compute-vtn.yaml.j2 b/roles/compute-node-config/templates/openstack-compute-vtn.yaml.j2
index 0e89cdc..88ab8d1 100644
--- a/roles/compute-node-config/templates/openstack-compute-vtn.yaml.j2
+++ b/roles/compute-node-config/templates/openstack-compute-vtn.yaml.j2
@@ -27,14 +27,9 @@
{% endif %}
# VTN networking for OpenStack Compute Nodes
-{% for node in groups["compute"] %}
-{% if (('ipv4' in hostvars[node]['ansible_fabric']) or
- ('ipv4' in hostvars[node]['ansible_br_int'])) %}
-{% if ('ipv4' in hostvars[node]['ansible_fabric']) %}
-{% set node_interface = hostvars[node]['ansible_fabric'] %}
-{% else %}
-{% set node_interface = hostvars[node]['ansible_br_int'] %}
-{% endif %}
+{% for node in groups['compute'] %}
+{% if 'ipv4' in hostvars[node]['ansible_' ~ compute_external_interface] %}
+{% set node_interface = hostvars[node]['ansible_' ~ compute_external_interface] %}
# Compute node, fully defined in compute-nodes.yaml
{{ hostvars[node]['ansible_hostname'] }}:
diff --git a/roles/compute-node-config/templates/openstack-compute.yaml.j2 b/roles/compute-node-config/templates/openstack-compute.yaml.j2
index 7325aa4..0a4fb9c 100644
--- a/roles/compute-node-config/templates/openstack-compute.yaml.j2
+++ b/roles/compute-node-config/templates/openstack-compute.yaml.j2
@@ -24,9 +24,8 @@
no-update: true
# OpenStack compute nodes
-{% for node in groups["compute"] %}
-{% if (('ipv4' in hostvars[node]['ansible_fabric']) or
- ('ipv4' in hostvars[node]['ansible_br_int'])) %}
+{% for node in groups['compute'] %}
+{% if 'ipv4' in hostvars[node]['ansible_' ~ compute_external_interface] %}
{{ hostvars[node]['ansible_hostname'] }}:
type: tosca.nodes.Node
requirements: