another merge with master branch
diff --git a/containers/Makefile b/containers/Makefile
index a6aa744..92685e7 100644
--- a/containers/Makefile
+++ b/containers/Makefile
@@ -5,7 +5,6 @@
sudo docker-compose run xos python /opt/xos/tosca/run.py padmin@vicci.org /root/setup/setup.yaml
sudo docker-compose run xos python /opt/xos/tosca/run.py padmin@vicci.org /root/setup/nodes.yaml
sudo docker-compose run xos python /opt/xos/tosca/run.py padmin@vicci.org /root/setup/images.yaml
- sudo docker exec containers_xos_1 cp /opt/xos/configurations/frontend/mocks/xos_mcord_config /opt/xos/xos_configuration/
nodes.yaml:
export SETUPDIR=.; bash ../xos/configurations/common/make-nodes-yaml.sh
@@ -15,29 +14,5 @@
.PHONY: local_containers
local_containers:
- cd xos; make devel
- cd synchronizer; make
-enter-xos:
- sudo docker exec -it containers_xos_1 bash
-
-enter-os:
- sudo docker exec -it containers_xos_synchronizer_openstack_1 bash
-
-enter-mc:
- sudo docker exec -it containers_xos_synchronizer_mcordservice1 bash
-
-upgrade_pkgs:
- sudo pip install httpie --upgrade
-
-rebuild_xos:
- make -C xos devel
-
-rebuild_synchronizer:
- make -C synchronizer
-
-stop:
- docker-compose stop
-
-rm:
- docker-compose stop; docker-compose rm
-
+ cd containers/xos; make devel
+ cd containers/synchronizer; make
diff --git a/containers/admin-openrc.sh b/containers/admin-openrc.sh
index 24cd509..f27fdac 100644
--- a/containers/admin-openrc.sh
+++ b/containers/admin-openrc.sh
@@ -1,8 +1,6 @@
# Replace with the OpenStack admin credentials for your cluster
-export OS_PROJECT_DOMAIN_ID=default
-export OS_USER_DOMAIN_ID=default
export OS_TENANT_NAME=admin
export OS_USERNAME=admin
-export OS_PASSWORD=mcord
-export OS_AUTH_URL=http://10.102.81.3:35357/v2.0
+export OS_PASSWORD=admin
+export OS_AUTH_URL=http://localhost:35357/v2.0
diff --git a/containers/docker-compose.yml b/containers/docker-compose.yml
index 15d28a6..24596a3 100644
--- a/containers/docker-compose.yml
+++ b/containers/docker-compose.yml
@@ -14,18 +14,6 @@
volumes:
- .:/root/setup:ro
-xos_synchronizer_mcordservice:
- image: xosproject/xos-synchronizer-openstack
- command: bash -c "sleep 120; python /opt/xos/synchronizers/mcordservice/mcordservice-synchronizer.py -C /opt/xos/synchronizers/mcordservice/mcordservice_vtnconfig"
- labels:
- org.xosproject.kind: synchronizer
- org.xosproject.target: mcordservice
- links:
- - xos_db
- volumes:
- - ../setup/id_rsa/id_rsa:/opt/xos/synchronizers/mcordservice/mcordservice_private_key:ro # private key
- - ../setup:/root/setup:ro
-
# FUTURE
#xos_swarm_synchronizer:
# image: xosproject/xos-swarm-synchronizer
@@ -42,4 +30,3 @@
- "8000:8000"
volumes:
- .:/root/setup:ro
- - ../setup/id_rsa/id_rsa:/opt/xos/synchronizers/mcordservice/mcordservice_private_key:ro # private key
diff --git a/containers/images.yaml b/containers/images.yaml
deleted file mode 100644
index 90cbbb6..0000000
--- a/containers/images.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
-tosca_definitions_version: tosca_simple_yaml_1_0
-
-imports:
- - custom_types/xos.yaml
-
-description: autogenerated nodes file
-
-topology_template:
- node_templates:
- mysite:
- type: tosca.nodes.Site
-
- MyDeployment:
- type: tosca.nodes.Deployment
- properties:
- flavors: m1.large, m1.medium, m1.small
- requirements:
diff --git a/containers/nodes.yaml b/containers/nodes.yaml
deleted file mode 100644
index 1f6ff45..0000000
--- a/containers/nodes.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-tosca_definitions_version: tosca_simple_yaml_1_0
-
-imports:
- - custom_types/xos.yaml
-
-description: autogenerated nodes file
-
-topology_template:
- node_templates:
- MyDeployment:
- type: tosca.nodes.Deployment
- mysite:
- type: tosca.nodes.Site
diff --git a/containers/xos/Dockerfile.devel b/containers/xos/Dockerfile.devel
index 1e2532f..5dc62a6 100644
--- a/containers/xos/Dockerfile.devel
+++ b/containers/xos/Dockerfile.devel
@@ -91,6 +91,5 @@
# Define working directory.
WORKDIR /opt/xos
-# RUN python /opt/xos/manage.py makemigrations mcordservice
# Define default command.
CMD update-ca-certificates && python /opt/xos/manage.py runserver 0.0.0.0:8000 --insecure --makemigrations