move unused files to old folder && update bbu key && change image name to vbbu
(1) move unused files to "old" folder
(2) changed the bbu key name and location
(3) docker 1.10 does not support uppercase characters in docker image name
So changed vBBU to vbbu
Change-Id: I3d83f9e4c780c14ec6a4e27ca0239829c867d640
diff --git a/mcord/Makefile b/mcord/Makefile
index 1ee1435..3edb916 100644
--- a/mcord/Makefile
+++ b/mcord/Makefile
@@ -67,7 +67,7 @@
#$(RUN_TOSCA_BOOTSTRAP) $(SERVICE_DIR)/vtr/xos/vtr-onboard.yaml
$(RUN_TOSCA_BOOTSTRAP) synchronizers.yaml
$(RUN_TOSCA_BOOTSTRAP) ../common/enable-onboarding.yaml
- bash ../common/wait_for_onboarding_ready.sh 81 services/vBBU
+ bash ../common/wait_for_onboarding_ready.sh 81 services/vbbu
#bash ../common/wait_for_onboarding_ready.sh 81 services/vPGWC
bash ../common/wait_for_onboarding_ready.sh 81 services/vtn
bash ../common/wait_for_onboarding_ready.sh 81 services/onos
diff --git a/mcord/mcord.yaml b/mcord/mcord.yaml
index 450bd23..0af1a5f 100644
--- a/mcord/mcord.yaml
+++ b/mcord/mcord.yaml
@@ -122,9 +122,9 @@
icon_url: /static/mCordServices/service_server.png
view_url: /admin/mcord/vbbucomponent
public_key: { get_artifact: [ SELF, pubkey, LOCAL_FILE] }
- private_key_fn: /opt/xos/configurations/mcord/mcord_private_key
+ private_key_fn: /opt/xos/services/vBBU/keys/vBBU_rsa
artifacts:
- pubkey: /opt/xos/configurations/mcord/mcord_public_key
+ pubkey: /opt/xos/services/vBBU/keys/vBBU_rsa.pub
vPGWC:
type: tosca.nodes.MCORDService
diff --git a/mcord/old/Makefile.0 b/mcord/old/Makefile.0
new file mode 100644
index 0000000..53fec7b
--- /dev/null
+++ b/mcord/old/Makefile.0
@@ -0,0 +1,51 @@
+.PHONY: xos
+xos: nodes.yaml images.yaml
+ sudo docker-compose up -d
+ ../common/wait_for_xos_port.sh 8000
+ sudo docker-compose run xos python /opt/xos/tosca/run.py none /opt/xos/configurations/common/fixtures.yaml
+ sudo docker-compose run xos python /opt/xos/tosca/run.py none /opt/xos/configurations/common/mydeployment.yaml
+ sudo docker-compose run xos python /opt/xos/tosca/run.py none /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-compose run xos python /opt/xos/tosca/run.py padmin@vicci.org /root/setup/mgmt-net.yaml
+ sudo docker-compose run xos python /opt/xos/tosca/run.py padmin@vicci.org /root/setup/mcord.yaml
+ sudo docker exec mcord_xos_1 cp /opt/xos/configurations/mcord/xos_mcord_config /opt/xos/xos_configuration/
+ sudo docker exec mcord_xos_1 touch /opt/xos/xos/settings.py
+
+nodes.yaml:
+ export SETUPDIR=.; bash ../common/make-nodes-yaml.sh
+
+images.yaml:
+ export SETUPDIR=.; bash ../common/make-images-yaml.sh
+
+.PHONY: local_containers
+local_containers:
+ cd ../../../containers/xos; make devel
+ cd ../../../containers/synchronizer; make
+enter-xos:
+ sudo docker exec -it mcord_xos_1 bash
+
+enter-os:
+ sudo docker exec -it mcord_xos_synchronizer_openstack_1 bash
+
+enter-vbbu:
+ sudo docker exec -it mcord_xos_synchronizer_vbbu_1 bash
+
+enter-vpgwc:
+ sudo docker exec -it mcord_xos_synchronizer_vpgwc_1 bash
+
+upgrade_pkgs:
+ sudo pip install httpie --upgrade
+
+rebuild_xos:
+ make -C ../../../containers/xos devel
+
+rebuild_synchronizer:
+ make -C ../../../containers/synchronizer
+
+stop:
+ docker-compose stop
+
+rm:
+ docker-compose stop; docker-compose rm
+
diff --git a/mcord/docker-compose.yml b/mcord/old/docker-compose.yml
similarity index 100%
rename from mcord/docker-compose.yml
rename to mcord/old/docker-compose.yml
diff --git a/mcord/migrations/0001_initial.py b/mcord/old/migrations/0001_initial.py
similarity index 100%
rename from mcord/migrations/0001_initial.py
rename to mcord/old/migrations/0001_initial.py
diff --git a/mcord/migrations/__init__.py b/mcord/old/migrations/__init__.py
similarity index 100%
rename from mcord/migrations/__init__.py
rename to mcord/old/migrations/__init__.py
diff --git a/mcord/postgresql/Dockerfile b/mcord/old/postgresql/Dockerfile
similarity index 100%
rename from mcord/postgresql/Dockerfile
rename to mcord/old/postgresql/Dockerfile
diff --git a/mcord/postgresql/Makefile b/mcord/old/postgresql/Makefile
similarity index 100%
rename from mcord/postgresql/Makefile
rename to mcord/old/postgresql/Makefile
diff --git a/mcord/synchronizer/Dockerfile b/mcord/old/synchronizer/Dockerfile
similarity index 100%
rename from mcord/synchronizer/Dockerfile
rename to mcord/old/synchronizer/Dockerfile
diff --git a/mcord/synchronizer/Makefile b/mcord/old/synchronizer/Makefile
similarity index 100%
rename from mcord/synchronizer/Makefile
rename to mcord/old/synchronizer/Makefile
diff --git a/mcord/synchronizer/conf/ansible-hosts b/mcord/old/synchronizer/conf/ansible-hosts
similarity index 100%
rename from mcord/synchronizer/conf/ansible-hosts
rename to mcord/old/synchronizer/conf/ansible-hosts
diff --git a/mcord/synchronizer/conf/synchronizer.conf b/mcord/old/synchronizer/conf/synchronizer.conf
similarity index 100%
rename from mcord/synchronizer/conf/synchronizer.conf
rename to mcord/old/synchronizer/conf/synchronizer.conf
diff --git a/mcord/vbbu.yaml b/mcord/old/vbbu.yaml
similarity index 100%
rename from mcord/vbbu.yaml
rename to mcord/old/vbbu.yaml
diff --git a/mcord/vpgwc.yaml b/mcord/old/vpgwc.yaml
similarity index 100%
rename from mcord/vpgwc.yaml
rename to mcord/old/vpgwc.yaml
diff --git a/mcord/xos/Dockerfile b/mcord/old/xos/Dockerfile
similarity index 100%
rename from mcord/xos/Dockerfile
rename to mcord/old/xos/Dockerfile
diff --git a/mcord/xos/Dockerfile.devel b/mcord/old/xos/Dockerfile.devel
similarity index 100%
rename from mcord/xos/Dockerfile.devel
rename to mcord/old/xos/Dockerfile.devel
diff --git a/mcord/xos/Dockerfile.templ b/mcord/old/xos/Dockerfile.templ
similarity index 100%
rename from mcord/xos/Dockerfile.templ
rename to mcord/old/xos/Dockerfile.templ
diff --git a/mcord/xos/Makefile b/mcord/old/xos/Makefile
similarity index 100%
rename from mcord/xos/Makefile
rename to mcord/old/xos/Makefile
diff --git a/mcord/xos/initdb b/mcord/old/xos/initdb
similarity index 100%
rename from mcord/xos/initdb
rename to mcord/old/xos/initdb