Merge branch 'master' into feature/container_ssl
diff --git a/.dockerignore b/.dockerignore
index 849d27a..ea51f67 100755
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,4 +1,3 @@
views/
applications/
-containers/
-xos/tests/api/node_modules
\ No newline at end of file
+xos/tests/api/node_modules
diff --git a/containers/xos/Dockerfile.devel b/containers/xos/Dockerfile.devel
index 5dc62a6..2b796e4 100644
--- a/containers/xos/Dockerfile.devel
+++ b/containers/xos/Dockerfile.devel
@@ -74,6 +74,10 @@
ADD http://code.jquery.com/jquery-1.9.1.min.js /usr/local/lib/python2.7/dist-packages/suit/static/suit/js/
+# Include certificates from Openstack
+ADD containers/xos/local_certs.crt /usr/local/share/ca-certificates/local_certs.crt
+RUN update-ca-certificates
+
# Install XOS
ADD xos /opt/xos
RUN chmod +x /opt/xos/tools/xos-manage
@@ -92,4 +96,4 @@
WORKDIR /opt/xos
# Define default command.
-CMD update-ca-certificates && python /opt/xos/manage.py runserver 0.0.0.0:8000 --insecure --makemigrations
+CMD python /opt/xos/manage.py runserver 0.0.0.0:8000 --insecure --makemigrations
diff --git a/containers/xos/local_certs.crt b/containers/xos/local_certs.crt
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/containers/xos/local_certs.crt
diff --git a/xos/configurations/cord-pod/Makefile b/xos/configurations/cord-pod/Makefile
index 1b42f68..0850686 100644
--- a/xos/configurations/cord-pod/Makefile
+++ b/xos/configurations/cord-pod/Makefile
@@ -62,5 +62,6 @@
.PHONY: local_containers
local_containers:
+ cat /usr/local/share/ca-certificates/* > ../../../containers/xos/local_certs.crt
cd ../../../containers/xos; make devel
cd ../../../containers/synchronizer; make
diff --git a/xos/configurations/cord-pod/docker-compose.yml b/xos/configurations/cord-pod/docker-compose.yml
index e2a5768..422849a 100644
--- a/xos/configurations/cord-pod/docker-compose.yml
+++ b/xos/configurations/cord-pod/docker-compose.yml
@@ -18,6 +18,19 @@
- ../vtn/files/xos_vtn_config:/opt/xos/xos_configuration/xos_vtn_config:ro
- ./images:/opt/xos/images:ro
+xos_synchronizer_exampleservice:
+ image: xosproject/xos-synchronizer-openstack
+ command: bash -c "sleep 120; python /opt/xos/synchronizers/exampleservice/exampleservice-synchronizer.py -C /root/setup/files/exampleservice_config"
+ labels:
+ org.xosproject.kind: synchronizer
+ org.xosproject.target: exampleservice
+ links:
+ - xos_db
+ volumes:
+ - .:/root/setup:ro
+ - ../common/xos_common_config:/opt/xos/xos_configuration/xos_common_config:ro
+ - ./id_rsa:/opt/xos/synchronizers/exampleservice/exampleservice_private_key:ro
+
xos_synchronizer_onos:
image: xosproject/xos-synchronizer-openstack
command: bash -c "python /opt/xos/synchronizers/onos/onos-synchronizer.py -C /opt/xos/synchronizers/onos/onos_synchronizer_config"
@@ -101,3 +114,5 @@
- ./id_rsa.pub:/opt/xos/synchronizers/onos/onos_key.pub:ro
- ./id_rsa.pub:/opt/xos/synchronizers/vcpe/vcpe_public_key:ro
- ./id_rsa.pub:/opt/xos/synchronizers/monitoring_channel/monitoring_channel_public_key:ro
+ - ./id_rsa:/opt/xos/synchronizers/exampleservice/exampleservice_public_key:ro
+
diff --git a/xos/configurations/cord-pod/make-vtn-external-yaml.sh b/xos/configurations/cord-pod/make-vtn-external-yaml.sh
index 8d0885d..34ddfb7 100644
--- a/xos/configurations/cord-pod/make-vtn-external-yaml.sh
+++ b/xos/configurations/cord-pod/make-vtn-external-yaml.sh
@@ -30,7 +30,7 @@
privateGatewayMac: 00:00:00:00:00:01
localManagementIp: 172.27.0.1/24
ovsdbPort: 6641
- sshUser: root
+ sshUser: ubuntu
sshKeyFile: /root/node_key
sshPort: 22
xosEndpoint: http://xos/
@@ -106,4 +106,4 @@
properties:
dependencies: org.onosproject.drivers, org.onosproject.drivers.ovsdb, org.onosproject.openflow-base, org.onosproject.ovsdb-base, org.onosproject.dhcp, org.onosproject.cordvtn, org.onosproject.olt, org.onosproject.igmp, org.onosproject.cordmcast
autogenerate: vtn-network-cfg
-EOF
\ No newline at end of file
+EOF
diff --git a/xos/synchronizers/base/ansible.py b/xos/synchronizers/base/ansible.py
index b6f1ca2..b8bbcaa 100644
--- a/xos/synchronizers/base/ansible.py
+++ b/xos/synchronizers/base/ansible.py
@@ -201,7 +201,6 @@
proxy_command = "ProxyCommand ssh -q -i %s -o StrictHostKeyChecking=no %s@%s" % (private_key_pathname, instance_id, hostname)
f.write('ssh_args = -o "%s"\n' % proxy_command)
f.write('scp_if_ssh = True\n')
- f.write('pipelining = True\n')
f.write('\n[defaults]\n')
f.write('host_key_checking = False\n')
f.close()
diff --git a/xos/tools/xos-manage b/xos/tools/xos-manage
index 709882b..53b5bd8 100755
--- a/xos/tools/xos-manage
+++ b/xos/tools/xos-manage
@@ -144,6 +144,7 @@
python ./manage.py makemigrations syndicate_storage
python ./manage.py makemigrations cord
python ./manage.py makemigrations ceilometer
+ python ./manage.py makemigrations exampleservice
python ./manage.py makemigrations onos
python ./manage.py makemigrations openvpn
python ./manage.py makemigrations vtr
diff --git a/xos/xos/settings.py b/xos/xos/settings.py
index 417be81..bcb0f72 100644
--- a/xos/xos/settings.py
+++ b/xos/xos/settings.py
@@ -184,6 +184,7 @@
'services.cord',
'services.onos',
'services.ceilometer',
+ 'services.exampleservice',
'services.requestrouter',
'services.syndicate_storage',
'services.openvpn',