Merge lp:~thomnico/orange-box-examples/openstack-getimages into lp:orange-box-examples

[Nicolas Thomas]

=== modified file 'hadoop/get-hadoop-info.sh'
--- hadoop/get-hadoop-info.sh	2014-08-07 15:14:28 +0000
+++ hadoop/get-hadoop-info.sh	2014-10-16 15:43:45 +0000
@@ -1,4 +1,4 @@
 #!/bin/bash
 HADOOP_GUI=`juju status hadoop-master | grep public-address | awk '{ print $2 }' | xargs host | grep address | awk '{ print $4 }'`
-echo "hadoop-master gui: http://$HADOOP_GUI:50030"
+echo "hadoop-master gui: http://$HADOOP_GUI:50070"
 
 
=== modified file 'landscape/README'
--- landscape/README	2014-08-07 15:14:28 +0000
+++ landscape/README	2014-10-16 15:43:45 +0000
@@ -14,6 +14,12 @@
 You will need to create a file: "repo-file" in this directory with the URL of the Landscape repository.
 You will need to create a file: "license-file" in this directory with a valid license or trial license to use Landscape.
 
+Instruction explanations: 
+https://docs.google.com/a/canonical.com/document/d/1LF1xbsdVrCIVIzPyFXaJlnKc0wkANR7q1fkq3SNcyss
+
+Verify the pastebin in it for october  2014 it is:
+https://pastebin.canonical.com/117457/
+
 Overview:
 
 First an initial Juju environment will be used to deploy Landscape itself onto the OB.
 
=== added file 'openstack/get-cloud-images'
--- openstack/get-cloud-images	1970-01-01 00:00:00 +0000
+++ openstack/get-cloud-images	2014-10-16 15:43:45 +0000
@@ -0,0 +1,23 @@
+#!/bin/bash -e
+
+
+
+folder=/srv/data
+URLS="http://cloud-images.ubuntu.com/precise/current/precise-server-cloudimg-amd64-disk1.img \
+http://cloud-images.ubuntu.com/trusty/current/trusty-server-cloudimg-amd64-disk1.img \
+http://mirror.catn.com/pub/catn/images/qcow2/centos6.4-x86_64-gold-master.img \
+http://download.cirros-cloud.net/0.3.2/cirros-0.3.2-x86_64-disk.img "
+
+for URL in $URLS
+do
+FILENAME=${URL##*/}
+if [ -f $folder/$FILENAME ];
+then
+    echo "$FILENAME already downloaded." 
+else
+    wget -q -O  $folder/$FILENAME $URL
+fi
+done
+
+
+echo "To download Windows image get there : http://www.cloudbase.it/cloud-init-for-windows-instances/"
 
=== modified file 'openstack/multi-region/icehouse/trusty/02-configure-multi-region.sh'
--- openstack/multi-region/icehouse/trusty/02-configure-multi-region.sh	2014-08-23 19:20:45 +0000
+++ openstack/multi-region/icehouse/trusty/02-configure-multi-region.sh	2014-10-16 15:43:45 +0000
@@ -17,7 +17,8 @@
 #    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
+set -ex
+
 
 echo "This command is run to configure an Orange-Box Multi Region Openstack deployment"
 
@@ -128,7 +129,7 @@
 glance add name="Trusty x86_64" is_public=true container_format=ovf disk_format=qcow2 <  /srv/data/trusty-server-cloudimg-amd64-disk1.img
 glance add name="CentOS 6.4" is_public=true container_format=bare disk_format=qcow2 < /srv/data/centos6.4-x86_64-gold-master.img
 glance add name="Cirros 0.3" is_public=true container_format=bare disk_format=qcow2 < /srv/data/cirros-0.3.2-x86_64-disk.img
-glance add name="Windows Server 2012" is_public=true container_format=bare disk_format=qcow2 < /srv/data/windows_server_2012_r2_standard_eval_kvm_20131117.qcow2 &
+glance add name="Windows Server 2012" is_public=true container_format=bare disk_format=qcow2 < /srv/data/windows_server_2012_r2_standard_eval_kvm_20140607.qcow2 &
 
 done
 
 
=== modified file 'openstack/multi-region/icehouse/trusty/multi-region-icehouse-OB.yaml'
--- openstack/multi-region/icehouse/trusty/multi-region-icehouse-OB.yaml	2014-08-23 19:20:45 +0000
+++ openstack/multi-region/icehouse/trusty/multi-region-icehouse-OB.yaml	2014-10-16 15:43:45 +0000
@@ -97,6 +97,7 @@
       to: neutron-gateway-r1=0
       options: 
         "block-device": none
+        "config-flags": "storage_availability_zone=storage-r1"
         region: RegionOne
       annotations:
         "gui-x": "1904.6063232421875"
@@ -191,6 +192,7 @@
       options:
         region: RegionTwo
         "block-device": none
+        "config-flags": "storage_availability_zone=storage-r2"
       annotations:
         "gui-x": "4448.0172119140625"
         "gui-y": "1436.996467590332"
 
=== modified file 'openstack/orange-box-configure-openstack'
--- openstack/orange-box-configure-openstack	2014-09-22 13:12:33 +0000
+++ openstack/orange-box-configure-openstack	2014-10-16 15:43:45 +0000
@@ -21,7 +21,8 @@
 
 echo "This command is run to configure an Orange-Box Openstack deployment"
 
-sudo apt-get install -y python-keystone python-neutronclient python-novaclient python-glanceclient
+PKGS=" python-keystone python-neutronclient python-novaclient python-glanceclient"
+dpkg -l $PKGS > /dev/null || sudo apt-get install -y $PKGS
 
 NEUTRON_EXT_NET_GW="10.14.4.1"
 NEUTRON_EXT_NET_CIDR="10.14.0.0/16"
@@ -84,9 +85,9 @@
 
 #Upload images to glance
 glance add name="Precise x86_64" is_public=true container_format=ovf disk_format=qcow2 <  /srv/data/precise-server-cloudimg-amd64-disk1.img 
-#glance add name="Trusty x86_64" is_public=true container_format=ovf disk_format=qcow2 <  /srv/data/trusty-server-cloudimg-amd64-disk1.img
-#glance add name="CentOS 6.4" is_public=true container_format=bare disk_format=qcow2 < /srv/data/centos6.4-x86_64-gold-master.img
-#glance add name="Cirros 0.3" is_public=true container_format=bare disk_format=qcow2 < /srv/data/cirros-0.3.2-x86_64-disk.img
-#glance add name="Windows Server 2012" is_public=true container_format=bare disk_format=qcow2 < /srv/data/windows_server_2012_r2_standard_eval_kvm_20131117.qcow2 &
+glance add name="Trusty x86_64" is_public=true container_format=ovf disk_format=qcow2 <  /srv/data/trusty-server-cloudimg-amd64-disk1.img
+glance add name="CentOS 6.4" is_public=true container_format=bare disk_format=qcow2 < /srv/data/centos6.4-x86_64-gold-master.img
+glance add name="Cirros 0.3" is_public=true container_format=bare disk_format=qcow2 < /srv/data/cirros-0.3.2-x86_64-disk.img
+##glance add name="Windows Server 2012" is_public=true container_format=bare disk_format=qcow2 < /srv/data/windows_server_2012_r2_standard_eval_kvm_20140607.qcow2 &
 
 exit
 
=== modified file 'openstack/orange-box-launch-openstack-juju'
--- openstack/orange-box-launch-openstack-juju	2014-09-23 13:09:43 +0000
+++ openstack/orange-box-launch-openstack-juju	2014-10-16 15:43:45 +0000
@@ -28,7 +28,7 @@
 #Launch an instance
 NET_UUID="$(nova net-list | grep private | awk '{ print $2 }')"
 IMAGE_UUID="$(nova image-list | grep Trusty | awk '{ print $2 }')"
-nova boot --flavor 2 --key_name default --image $IMAGE_UUID --nic net-id=$NET_UUID --security_group default jumpserver
+nova boot --flavor 3 --key_name default --image $IMAGE_UUID --nic net-id=$NET_UUID --security_group default jumpserver
 sleep 40
 
 #Associate the floating IP with the new instance
@@ -48,6 +48,7 @@
 environments:
     openstack:
         type: openstack
+        use-floating-ip: true
         network: private
         auth-url: $OS_AUTH_URL
         tenant-name: $OS_TENANT_NAME
@@ -81,10 +82,12 @@
 #Install the Orange-box-examples package
 ssh -o StrictHostKeyChecking=no ubuntu@$FLOAT_IP "sudo apt-add-repository ppa:orange-box-examples/ppa && sudo apt-get update && sudo apt-get install -y orange-box-examples"
 
+## useless if juju floating ip option on.
+#########################################
 #Create a new floating IP and associate with juju bootstrap instance
-INSTANCE_ID="$(nova list | grep juju-openstack-machine-0 | awk '{ print $2}')"
-FLOAT_IP2="$(nova floating-ip-create | grep ext_net | awk '{ print $2}')"
-nova floating-ip-associate $INSTANCE_ID $FLOAT_IP2
+#INSTANCE_ID="$(nova list | grep juju-openstack-machine-0 | awk '{ print $2}')"
+#FLOAT_IP2="$(nova floating-ip-create | grep ext_net | awk '{ print $2}')"
+#nova floating-ip-associate $INSTANCE_ID $FLOAT_IP2 
 
 #Print the address of Juju-gui for deployments on Openstack
 echo "Now connect to the Juju-GUI at: http://$FLOAT_IP2/ to continue deployments on Openstack."
 
=== added directory 'zabbix'
=== added file 'zabbix/README'
--- zabbix/README	1970-01-01 00:00:00 +0000
+++ zabbix/README	2014-10-16 15:43:45 +0000
@@ -0,0 +1,19 @@
+# Creating a Zabbix.
+
+You do need a machine external to Juju to show the true integration.
+
+You must open the following port 80 (interface), 10050 et 10051 (zabbix)
+
+Create a security group if on AWS or OpenStack to ensure you can connect to and be sure you can access that machine/vm.
+
+Then simply do:
+./install-on-machine 54.164.161.172
+
+Use your IP of course.
+
+If blocked with a "Cleaning" msg .. kill and restart (it should be idempotent)
+
+Then http://54.164.161.172/zabbix/ 
+login admin / ubuntu
+
+# connect your JUJU env and agents.
 
=== added file 'zabbix/install-on-machine'
--- zabbix/install-on-machine	1970-01-01 00:00:00 +0000
+++ zabbix/install-on-machine	2014-10-16 15:43:45 +0000
@@ -0,0 +1,50 @@
+#!/bin/bash
+#
+#    zabbix install on vm
+#    Copyright (C) 2014 Canonical Ltd.
+#
+#    Authors: [e-mail]
+#
+#    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
+
+set -e
+
+VM_IP=$1
+
+if [[ -z "$VM_IP" ]] 
+then
+    echo "must give name/ip of the system to install on"
+    exit 2
+fi	
+ssh -o StrictHostKeyChecking=no ubuntu@$VM_IP sudo apt-get update
+
+#SSH into the instance and install git
+ssh -o StrictHostKeyChecking=no ubuntu@$VM_IP sudo apt-get -y install git
+
+#Get Zabbix code from SamNCo 
+ssh -o StrictHostKeyChecking=no ubuntu@$VM_IP "[[ -d zabbix/ ]] || git clone https://github.com/SaMnCo/ob-zabbix.git zabbix"
+
+ssh -o StrictHostKeyChecking=no ubuntu@$VM_IP "cd zabbix ; chmod +x install-zabbix-server.sh; sudo ./install-zabbix-server.sh"
+
+ssh -o StrictHostKeyChecking=no ubuntu@$VM_IP "sudo service zabbix-server stop"
+ssh -o StrictHostKeyChecking=no ubuntu@$VM_IP "mysql -uroot -pubuntu zabbix < zabbix/zabbix_full.sql"                           
+ssh -o StrictHostKeyChecking=no ubuntu@$VM_IP "sudo service zabbix-server start"
+
+
+#copy over SSH keys
+scp -o StrictHostKeyChecking=no ~/.ssh/id_rsa* ubuntu@$VM_IP:
+
+echo "Got to http://$VM_IP/zabbix "
+echo "login admin / ubuntu"
+exit
+
+#See here:https://kashyapc.fedorapeople.org/virt/snapshots-notes/snapshots-with-virsh-for-qcow2.txt for snapshot