Merge branch 'master' of github.com:open-cloud/xos
diff --git a/views/ngXosLib/generator-xos/app/index.js b/views/ngXosLib/generator-xos/app/index.js
index 1157973..57eee8c 100755
--- a/views/ngXosLib/generator-xos/app/index.js
+++ b/views/ngXosLib/generator-xos/app/index.js
@@ -60,7 +60,12 @@
},
writing: {
rcFiles: function(){
- userName = user.git.name().split(' ');
+ if (!user.git.name()){
+ userName = ['','']
+ }
+ else {
+ userName = user.git.name().split(' ');
+ }
this.fs.copy(this.templatePath('.bowerrc'), this.destinationPath(`${this.config.get('folder')}/${config.name}/.bowerrc`));
this.fs.copy(this.templatePath('.gitignore'), this.destinationPath(`${this.config.get('folder')}/${config.name}/.gitignore`));
},
diff --git a/xos/configurations/cord-pod/README-Tutorial.md b/xos/configurations/cord-pod/README-Tutorial.md
index 94f5170..9f8c9e9 100644
--- a/xos/configurations/cord-pod/README-Tutorial.md
+++ b/xos/configurations/cord-pod/README-Tutorial.md
@@ -19,13 +19,9 @@
ubuntu@pod:~$ bash single-node-pod.sh -e
```
-> NOTE: The above script can also automatically perform (nearly) all the steps of this
-> tutorial if run as `bash single-node-pod -e -t`. However, you will still need
-> to manually log into XOS and create an ExampleTenant, as described under
-> [Configure ExampleService in XOS](#configure-exampleservice-in-xos)
-> below. The script will tell you when it's time to do this.
+> NOTE: The above script can also automatically perform all tutoral steps if run as `bash single-node-pod -e -t`.
-Be patient... it will take at least one hour to fully set up the single-node POD.
+Be patient... it will take **at least one hour** to fully set up the single-node POD.
## Include ExampleService in XOS
@@ -147,3 +143,40 @@
Hooray! This shows that the subscriber (1) has external connectivity, and
(2) can access the new service via the vSG.
+
+## Troubleshooting
+
+Sometimes the ExampleService instance comes up with the wrong default route. If the
+ExampleService instance is active but the `curl` command does not work, SSH to the
+instance and check its default gateway. Assuming the management address of the `mysite_exampleservice`
+VM is 172.27.0.2:
+
+```
+ubuntu@pod:~$ ssh-agent bash
+ubuntu@pod:~$ ssh-add
+ubuntu@pod:~$ ssh -A ubuntu@nova-compute
+ubuntu@nova-compute:~$ ssh ubuntu@172.27.0.2
+ubuntu@mysite-exampleservice-2:~$ route -n
+Kernel IP routing table
+Destination Gateway Genmask Flags Metric Ref Use Iface
+0.0.0.0 172.27.0.1 0.0.0.0 UG 0 0 0 eth1
+10.168.1.0 0.0.0.0 255.255.255.0 U 0 0 0 eth0
+172.27.0.0 0.0.0.0 255.255.255.0 U 0 0 0 eth1
+```
+
+If the default gateway is not `10.168.1.1`, manually set it to this value.
+
+```
+ubuntu@mysite-exampleservice-2:~$ sudo bash
+root@mysite-exampleservice-2:~# route del default gw 172.27.0.1
+root@mysite-exampleservice-2:~# route add default gw 10.168.1.1
+root@mysite-exampleservice-2:~# route -n
+Kernel IP routing table
+Destination Gateway Genmask Flags Metric Ref Use Iface
+0.0.0.0 10.168.1.1 0.0.0.0 UG 0 0 0 eth0
+10.168.1.0 0.0.0.0 255.255.255.0 U 0 0 0 eth0
+172.27.0.0 0.0.0.0 255.255.255.0 U 0 0 0 eth1
+```
+
+Now the VM should have Internet connectivity and XOS will start downloading Apache.
+A short while later the `curl` test should complete.
diff --git a/xos/configurations/cord-pod/cdn/README.md b/xos/configurations/cord-pod/cdn/README.md
index 7517638..be8c184 100644
--- a/xos/configurations/cord-pod/cdn/README.md
+++ b/xos/configurations/cord-pod/cdn/README.md
@@ -55,6 +55,14 @@
1. run setup-logicalinterfaces.sh
+### CDN on VTN - important notes
+
+We manually edited synchronizers/vcpe/templates/dnsasq_safe_servers.j2 inside the vcpe synchronizer VM:
+
+ # temporary for ONS demo
+ address=/z.cdn.turner.com/207.141.192.134
+ address=/cnn-vh.akamaihd.net/207.141.192.134
+
### Test Commands
* First, make sure the vSG is the only DNS server available in the test client.