Merge branch 'master' of http://gerrit.opencord.org/cord
diff --git a/Vagrantfile b/Vagrantfile
index 8c61db6..007e7e5 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -25,8 +25,25 @@
d.vm.box = "ubuntu/trusty64"
d.vm.hostname = "prod"
d.vm.network "private_network", ip: "10.100.198.201"
+ d.vm.network "private_network", ip: "10.6.0.1", virtualbox__intnet: "cord-test-network"
d.vm.provider "virtualbox" do |v|
- v.memory = 1024
+ v.memory = 2048
+ end
+ end
+
+ config.vm.define "computenode" do |c|
+ c.vm.box = "clink15/pxe"
+ c.vm.synced_folder '.', '/vagrant', disable: true
+ c.vm.communicator = "none"
+ c.vm.hostname = "computenode"
+ c.vm.network "private_network",
+ adapter: "1",
+ type: "dhcp",
+ auto_config: false,
+ virtualbox__intnet: "cord-test-network"
+ c.vm.provider "virtualbox" do |v|
+ v.memory = 1048
+ v.gui = "true"
end
end
diff --git a/ansible/roles/common/files/ssh_config b/ansible/roles/common/files/ssh_config
new file mode 100644
index 0000000..990a43d
--- /dev/null
+++ b/ansible/roles/common/files/ssh_config
@@ -0,0 +1,3 @@
+Host *
+ StrictHostKeyChecking no
+ UserKnownHostsFile=/dev/null
diff --git a/ansible/roles/common/tasks/main.yml b/ansible/roles/common/tasks/main.yml
index 72441b6..b66f3e4 100644
--- a/ansible/roles/common/tasks/main.yml
+++ b/ansible/roles/common/tasks/main.yml
@@ -25,3 +25,16 @@
ignore_errors: yes
with_items: obsolete_services
tags: [common]
+
+- name: Ensure known_hosts file is absent
+ file:
+ path: /home/vagrant/.ssh/known_hosts
+ state: absent
+
+- name: Disable Known Host Checking
+ copy:
+ src: files/ssh_config
+ dest: /home/vagrant/.ssh/config
+ owner: vagrant
+ group: vagrant
+ mode: 0600
diff --git a/config/default.yml b/config/default.yml
index 349a42e..3dc13f1 100644
--- a/config/default.yml
+++ b/config/default.yml
@@ -4,7 +4,7 @@
# via `vargrant up headnode` from the gerrit.opencord.org/maas repository.
---
seedServer:
- ip: '10.100.198.202'
+ ip: '10.100.198.201'
# User name and password used by Ansible to connect to the host for remote
# provisioning
diff --git a/config/onlab_develop_pod.yml b/config/onlab_develop_pod.yml
new file mode 100644
index 0000000..1e12b4e
--- /dev/null
+++ b/config/onlab_develop_pod.yml
@@ -0,0 +1,39 @@
+# Deployment configuration for a phyical hardware POD
+---
+seedServer:
+ ip: '10.90.0.2'
+ # User name and password used by Ansible to connect to the host for remote
+ # provisioning
+ user: 'admin'
+ password: 'onos_test'
+ # Network address information for the head node:
+ #
+ # fabric_ip - the IP address and mask bits to be used to configure the network
+ # interface connected to the leaf - spine fabric
+ #
+ # management_ip - the IP address and mask bits to be used to configure the network
+ # interface connecting the head node to the POD internal
+ # management network. The head node will deliver DHCP addresses to
+ # the other compute nodes over this interface
+ #
+ # external_ip - the IP address and mask bits to be used to configure the network
+ # interface connecting the head node (and the POD) to the
+ # Internet. All traffic in the POD to external hosts will be
+ # NAT-ed through this interface
+ fabric_ip: '10.6.1.1/24'
+ management_ip: '10.6.0.1/24'
+ external_ip: '47.135.132.21/24'
+ management_iface: 'em2'
+ external_iface: 'em1'
+ skipTags:
+ - 'switch_support'
+ - 'interface_config'
+otherNodes:
+ # Experimental
+ #
+ # Specifies the subnet and address range that will be used to allocate IP addresses
+ # to the compute nodes as they are deployed into the POD.
+ fabric:
+ network: 10.6.1.1/24
+ range_low: 10.6.1.2
+ range_high: 10.6.1.253
diff --git a/utils/enable-remote-docker-registry b/utils/enable-remote-docker-registry
new file mode 100755
index 0000000..3bcddf6
--- /dev/null
+++ b/utils/enable-remote-docker-registry
@@ -0,0 +1,22 @@
+#!/bin/bash
+
+PROG=$(basename $0)
+
+HELP=$(echo "$*" | grep "\-h" | wc -w)
+
+if [ $HELP -ne 0 ]; then
+ echo "usage: $PROG <remote-registry>..."
+ exit 1
+fi
+
+OUT=$(tempfile)
+head -1 /etc/default/docker >> $OUT
+while [ $# -gt 0 ]; do
+ echo "DOCKER_OPTS=\"\$DOCKER_OPTS --insecure-registry $1\"" >> $OUT
+ shift
+done
+
+sudo cp $OUT /etc/default/docker
+rm $OUT
+
+sudo service docker restart