Merge lp:~thomnico/orange-box-examples/telco into lp:orange-box-examples

[Nicolas Thomas]

[Nicolas Thomas (thomnico)]

Darryl,

If you can skip adding the script
:'bin/orange-box-wildcard-dns-archive' right now ... to avoid
misunderstanding..

On Mon, Nov 10, 2014 at 11:58 AM, Nicolas Thomas
<email address hidden> wrote:
> Nicolas Thomas has proposed merging lp:~thomnico/orange-box-examples/telco into lp:orange-box-examples.
>
> Requested reviews:
> Darryl Weaver (dweaver)
>
> For more details, see:
> https://code.launchpad.net/~thomnico/orange-box-examples/telco/+merge/241256
> --
> https://code.launchpad.net/~thomnico/orange-box-examples/telco/+merge/241256
> You are the owner of lp:~thomnico/orange-box-examples/telco.
>
> === added file 'bin/orange-box-wildcard-dns-archive'
> --- bin/orange-box-wildcard-dns-archive 1970-01-01 00:00:00 +0000
> +++ bin/orange-box-wildcard-dns-archive 2014-11-10 10:57:16 +0000
> @@ -0,0 +1,73 @@
> +#!/bin/bash
> +#
> +# orange-box-wildcard-dns-archive
> +# Copyright (C) 2014 Canonical Ltd.
> +#
> +# Authors: Nicolas Thomas <email address hidden>
> +#
> +# This program is free software: you can redistribute it and/or modify
> +# it under the terms of the GNU General Public License as published by
> +# the Free Software Foundation, version 3 of the License.
> +#
> +# This program is distributed in the hope that it will be useful,
> +# but WITHOUT ANY WARRANTY; without even the implied warranty of
> +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
> +# GNU General Public License for more details.
> +#
> +# You should have received a copy of the GNU General Public License
> +# along with this program. If not, see <http://www.gnu.org/licenses/>.
> +
> +set -e
> +
> +fgrep "/etc/bind/named.conf.wildcard-archive" /etc/bind/named.conf > /dev/null && (echo "already applied" ; exit 2)
> +
> +if [ "$(id -u)" != "0" ]; then
> + echo "Must be run with sudo or by root"
> + exit 77
> +fi
> +
> +cat > /etc/bind/named.conf.wildcard-archive <<EOF
> +# Zone declarations.
> +zone "archive.ubuntu.com" {
> + type master;
> + file "/etc/bind/zones.wildcard-archive";
> +};
> +
> +EOF
> +
> +## Need to create a dns entry to ensure *.archive.ubuntu.com resolve locally
> +## Many charms/packages/install rely on this /etc/hosts is not enough
> +
> +echo '$TTL 300' > /etc/bind/zones.wildcard-archive
> +cat >> /etc/bind/zones.wildcard-archive <<EOF
> +@ IN SOA archive.ubuntu.com ubuntu.com (
> + 999 ; serial
> + 600 ; Refresh
> + 1800 ; Retry
> + 604800 ; Expire
> + 300 ; TTL
> + )
> +
> + IN NS archive.ubuntu.com
> +
> +
> +archive.ubuntu.com IN A 10.14.4.1
> +
> +ns IN CNAME archive.ubuntu.com
> +
> +* IN A 10.14.4.1
> +
> +EOF
> +
> +
> +if ( fgrep ubuntu-cloud.archive.canonical.com /etc/hosts > /dev/null )
> +then
> + cat >> /etc/hosts <<EOF
> +10.14.4.1 archive.ubuntu.com ubuntu-cloud.archive.canonical.com
> +EOF
> +fi
> +
> +echo 'include "/etc/bind/named.conf.wildcard-archive";' >> /etc/bind/named.conf
> +service bind9 restart
> +
> +## Todo checking apache v site works for *.archive.ubuntu.com
>
> === modified file 'cloudfoundry/01-dep...

[lp:~thomnico/orange-box-examples/telco]

62. By Nicolas Thomas on 2014-11-10

CI after re merge

63. By Nicolas Thomas on 2014-11-10

Merge and repush

=== modified file 'cloudfoundry/01-deploy.sh'
--- cloudfoundry/01-deploy.sh	2014-10-28 18:40:11 +0000
+++ cloudfoundry/01-deploy.sh	2014-11-10 11:14:37 +0000
@@ -30,7 +30,8 @@
     series: trusty
     services:
         cloudfoundry:
-            branch: trusty/cloudfoundry
+            charm: local:trusty/cloudfoundry
+            num_untis: 1
             constraints: mem=2048
             options:
                 admin_secret: $ADMIN_PASS
@@ -38,6 +39,19 @@
                 cf_version: latest
 EOF
 
+    cat << EOF > cf-bundle-gui.yaml
+cloudfoundry:
+    series: trusty
+    services:
+        cloudfoundry:
+            charm: "cs:~cf-charmers/trusty/cloudfoundry"
+            num_untis: 1
+            constraints: mem=2048
+            options:
+                admin_secret: $ADMIN_PASS
+                placement: ${1:-dense}
+                cf_version: latest
+EOF
 
 export JUJU_REPOSITORY=$PWD
 juju-deployer -c cf-bundle.yaml
@@ -48,4 +62,7 @@
 juju set cloudfoundry  domain=$API_IP.xip.io
 
 echo "Deployment completed"
-echo "run cflogin in a few minutes"
+echo "run:"
+echo " source trusty/cloudfoundry/helpers.sh"
+echo " cflogin"
+echo "    ... in a few minutes"

=== renamed file 'telco/bzr-sync-local-charms' => 'telco/sync-local-charms'
--- telco/bzr-sync-local-charms	2014-11-10 00:33:48 +0000
+++ telco/sync-local-charms	2014-11-10 11:14:37 +0000
@@ -7,32 +7,14 @@
 
 
 ROOT=$PWD
-mkdir -p precise
-cd precise
-for f in clearwater-bono/   clearwater-homer/      clearwater-ralf/    dns/ clearwater-ellis/  clearwater-homestead/  clearwater-sprout/
-do
-    if [ -d $f ] 
-    then
-	cd $f
-	bzr pull
-	cd ..
-    else
-	bzr branch lp:~thomnico/charms/precise/$f/trunk $f
-    fi
-    
-done
-
-cd $ROOT
-mkdir -p trusty
-cd trusty
-for f in sipml5
-do
-    if [ -d $f ] 
-    then
-	cd $f
-	bzr pull
-	cd ..
-    else
-	bzr branch lp:~thomnico/charms/trusty/$f/trunk $f
-    fi
-done
+
+if [ -d clearwater-juju/charms/precise   ] 
+    then
+	cd clearwater-juju
+	git pull 
+	cd ..
+    else
+    git clone https://github.com/Metaswitch/clearwater-juju.git
+    ln -sf clearwater-juju/charms/precise/ .
+fi
+

=== added directory 'telco/trusty'