Merge master into voltha-1.1 and correct version information
Merge commit '8be8384ef55d1e109c2f5d61c41f1f4953377ff2' into HEAD
Change-Id: I77b1db562fd3508c0e9c7b9042af0d9ee8801f69
diff --git a/install/BuildVoltha.sh b/install/BuildVoltha.sh
index 6b83786..a3bec02 100755
--- a/install/BuildVoltha.sh
+++ b/install/BuildVoltha.sh
@@ -40,7 +40,6 @@
cp voltha/voltha.production.yml voltha/voltha.yml
cp ofagent/ofagent.production.yml ofagent/ofagent.yml
cp netconf/netconf.production.yml netconf/netconf.yml
-cp chameleon/chameleon.production.yml chameleon/chameleon.yml
# Destroy the VM if it's running
vagrant destroy voltha${uId}
diff --git a/install/ansible/roles/installer/tasks/main.yml b/install/ansible/roles/installer/tasks/main.yml
index 52ccaf4..098d17d 100644
--- a/install/ansible/roles/installer/tasks/main.yml
+++ b/install/ansible/roles/installer/tasks/main.yml
@@ -29,6 +29,7 @@
- install/sort_packages.sh
- install/sort_packages.py
- install/install_packages.sh
+ - install/BashLoginTarget.sh
- install/ansible
- compose
- consul_config/basic.json
diff --git a/install/cleanup.sh b/install/cleanup.sh
index a08d620..f18d4e4 100755
--- a/install/cleanup.sh
+++ b/install/cleanup.sh
@@ -20,6 +20,4 @@
git checkout ../voltha/voltha.yml
git checkout ../ofagent/ofagent.yml
git checkout ../netconf/netconf.yml
-pushd ~/cord/component/chameleon
-git checkout chameleon.yml
popd
diff --git a/install/containers.cfg b/install/containers.cfg
index c92eba1..3d01e0c 100644
--- a/install/containers.cfg
+++ b/install/containers.cfg
@@ -5,7 +5,6 @@
- cord/shovel:latest
- cord/netconf:latest
- cord/ofagent:latest
- - cord/chameleon:latest
- cord/voltha:latest
- cord/voltha-base:latest
- consul:0.9.2
diff --git a/install/voltha-swarm-start.sh b/install/voltha-swarm-start.sh
index b33e797..ceb45b8 100755
--- a/install/voltha-swarm-start.sh
+++ b/install/voltha-swarm-start.sh
@@ -38,11 +38,11 @@
docker stack deploy -c ${voltha_base_dir}/compose/docker-compose-fluentd-agg-cluster.yml fluentd
sleep 2
docker stack deploy -c ${voltha_base_dir}/compose/docker-compose-fluentd-cluster.yml fluentd
+docker stack deploy -c ${voltha_base_dir}/compose/docker-compose-onos-swarm.yml onos
docker stack deploy -c ${voltha_base_dir}/compose/docker-compose-voltha-swarm.yml vcore
docker stack deploy -c ${voltha_base_dir}/compose/docker-compose-ofagent-swarm.yml ofagent
docker stack deploy -c ${voltha_base_dir}/compose/docker-compose-envoy-swarm.yml voltha
docker stack deploy -c ${voltha_base_dir}/compose/docker-compose-vcli.yml cli
-docker stack deploy -c ${voltha_base_dir}/compose/docker-compose-chameleon-swarm.yml chameleon
docker stack deploy -c ${voltha_base_dir}/compose/docker-compose-netconf-swarm.yml netconf
docker service create -d --name tools --network voltha_net --network kafka_net --publish "4022:22" voltha/tools
diff --git a/install/voltha-swarm-stop.sh b/install/voltha-swarm-stop.sh
index 2633cd9..8aca489 100755
--- a/install/voltha-swarm-stop.sh
+++ b/install/voltha-swarm-stop.sh
@@ -1,13 +1,13 @@
#!/bin/bash
-docker service rm chameleon_chameleon
docker service rm netconf_netconf
docker service rm cli_cli
docker service rm voltha_voltha
-docker service rm ofagent_ofagent
+docker service rm ofagent_ofagent
docker service rm vcore_vcore
docker service rm tools
docker stack rm consul
docker stack rm kafka
-docker stack rm fluentd
+docker stack rm fluentd
+docker stack rm onos
docker network rm voltha_net