Merge branch 'master' of github.com:open-cloud/xos
diff --git a/xos/configurations/cord/cord.yaml b/xos/configurations/cord/cord.yaml
index 46acde9..9929a84 100644
--- a/xos/configurations/cord/cord.yaml
+++ b/xos/configurations/cord/cord.yaml
@@ -14,6 +14,12 @@
- vcpe_tenant:
node: service_vcpe
relationship: tosca.relationships.TenantOfService
+ - lan_network:
+ node: lan_network
+ relationship: tosca.relationships.UsesNetwork
+ - wan_network:
+ node: wan_network
+ relationship: tosca.relationships.UsesNetwork
properties:
view_url: /admin/cord/voltservice/$id$/
kind: vOLT
@@ -241,6 +247,11 @@
- site:
node: mysite
relationship: tosca.relationships.MemberOfSite
+ - vcpe_docker_image:
+ node: andybavier/docker-vcpe
+ relationship: tosca.relationships.UsesImage
+ properties:
+ default_isolation: container
mysite_onos_vbng:
description: ONOS Controller Slice for vBNG
diff --git a/xos/openstack_observer/steps/sync_container.yaml b/xos/openstack_observer/steps/sync_container.yaml
index 56edaea..b60ffb8 100644
--- a/xos/openstack_observer/steps/sync_container.yaml
+++ b/xos/openstack_observer/steps/sync_container.yaml
@@ -104,6 +104,12 @@
shell: systemctl daemon-reload
when: systemctl.stat.exists == True
+{% if ports %}
+ - name: make sure bridges are setup
+ shell: ifconfig {{ '{{' }} item.bridge {{ '}}' }}
+ with_items: "ports"
+{% endif %}
+
- name: Make sure container is running
service: name=container-{{ container_name }} state=started