Merge lp:~bbaqar/charms/bundles/plumgrid-ons/single-controller-halfdome-500 into lp:~plumgrid-team/charms/bundles/plumgrid-ons/single-controller

[Bilal Baqar]

[lp:~bbaqar/charms/bundles/plumgrid-ons/single-controller-halfdome-500]

34. By Bilal Baqar on 2016-05-17

bundle changes for 5.0

35. By Bilal Baqar on 2016-05-17

Changes for 5.0

Unmerged revisions

35. By Bilal Baqar on 2016-05-17

Changes for 5.0

34. By Bilal Baqar on 2016-05-17

bundle changes for 5.0

33. By Bilal Baqar on 2016-05-17

bundle changes for 5.0

=== modified file 'bundle-cli.yaml'
--- bundle-cli.yaml	2016-01-25 23:18:17 +0000
+++ bundle-cli.yaml	2016-05-17 18:38:21 +0000
@@ -1,9 +1,44 @@
-plumgrid-ons:
+# This bundle file containts the following bundles:
+# 1. plumgrid-ons-phase1:
+#        This bundle deploys 3 nodes in total:
+#            - 1 x Compute
+#            - 1 x Controller
+#            - 1 x Gateways
+#        Please note that the JUJU Bootstrap node is a seperate node
+#        This bundle waits for all the nodes to be deployed before it exits
+#
+# 2. plumgrid-ons-phase2:
+#        This bundle deploys all the required charms to bring up OpenStack with PLUMgrid
+#
+# 3. plumgrid-configs:
+#        This bundle overwrites the configs in plumgrid-ons-phase2
+#
+# 4. plumgrid-kilo:
+#        This bundle overwrites the source and openstack-origin configs to deploy OpenStack Kilo with PLUMgrid
+#
+
+plumgrid-ons-phase1:
+  series: trusty
+  services:
+    controller-node:
+      charm: "cs:trusty/ubuntu"
+      num_units: 1
+      constraints: tags=controller
+    compute-node:
+      charm: "cs:trusty/ubuntu"
+      num_units: 1
+      constraints: tags=compute
+    gateway-node:
+      charm: "cs:trusty/ubuntu"
+      num_units: 1
+      constraints: tags=gateway
+plumgrid-ons-phase2:
+  inherits: plumgrid-ons-phase1
   series: 'trusty'
   relations:
     - ['mysql', 'keystone']
     - ['nova-cloud-controller', 'mysql']
-    - [nova-cloud-controller, rabbitmq-server]
+    - ['nova-cloud-controller', 'rabbitmq-server']
     - ['nova-cloud-controller', 'glance']
     - ['nova-cloud-controller', 'keystone']
     - ['nova-compute', 'nova-cloud-controller']
@@ -12,11 +47,6 @@
     - ['nova-compute', 'glance']
     - ['glance', 'mysql']
     - ['glance', 'keystone']
-    - ['glance', 'cinder']
-    - ['mysql', 'cinder']
-    - ['cinder', 'rabbitmq-server']
-    - ['cinder', 'nova-cloud-controller']
-    - ['cinder', 'keystone']
     - ['openstack-dashboard', 'keystone']
     - ['neutron-api', 'mysql']
     - ['neutron-api', 'keystone']
@@ -29,126 +59,137 @@
     - ['plumgrid-director', 'plumgrid-gateway']
   services:
     mysql:
-      charm: cs:trusty/mysql-26
+      charm: cs:trusty/percona-cluster-32
       num_units: 1
       annotations:
         "gui-x": "-250"
         "gui-y": "250"
-      to: 'lxc:plumgrid-director=0'
+      to: 'lxc:controller-node=0'
     rabbitmq-server:
-      charm: cs:trusty/rabbitmq-server-33
+      charm: cs:trusty/rabbitmq-server-43
       num_units: 1
       annotations:
         "gui-x": "-750"
         "gui-y": "250"
-      to: 'lxc:plumgrid-director=0'
+      to: 'lxc:controller-node=0'
     keystone:
-      charm: cs:trusty/keystone-28
+      charm: cs:trusty/keystone-33
       num_units: 1
       options:
         admin-password: plumgrid
-        openstack-origin: cloud:trusty-kilo
+        use-https: "no"
       annotations:
         "gui-x": "0"
         "gui-y": "0"
-      to: 'lxc:plumgrid-director=0'
+      to: 'lxc:controller-node=0'
     nova-cloud-controller:
-      charm: cs:~openstack-charmers-next/trusty/nova-cloud-controller-1
+      charm: cs:trusty/nova-cloud-controller-66
       num_units: 1
       options:
         console-access-protocol: novnc
         network-manager: Neutron
-        openstack-origin: cloud:trusty-kilo
         quantum-security-groups: 'yes'
       annotations:
         "gui-x": "-500"
         "gui-y": "0"
-      to: 'lxc:plumgrid-director=0'
+      to: 'lxc:controller-node=0'
     glance:
-      charm: cs:trusty/glance-24
+      charm: cs:trusty/glance-30
       num_units: 1
-      options:
-        openstack-origin: cloud:trusty-kilo
       annotations:
         "gui-x": "-250"
         "gui-y": "-250"
-      to: 'lxc:plumgrid-director=0'
+      to: 'lxc:controller-node=0'
     openstack-dashboard:
-      charm: cs:trusty/openstack-dashboard-16
+      charm: cs:trusty/openstack-dashboard-21
       num_units: 1
-      options:
-        openstack-origin: cloud:trusty-kilo
       annotations:
         "gui-x": "0"
         "gui-y": "-500"
-      to: 'lxc:plumgrid-director=0'
-    cinder:
-      charm: cs:trusty/cinder-26
-      num_units: 1
-      options:
-        openstack-origin: cloud:trusty-kilo
-      annotations:
-        "gui-x": "250"
-        "gui-y": "-250"
-      to: 'lxc:plumgrid-director=0'
+      to: 'lxc:controller-node=0'
     neutron-api:
-      charm: cs:~openstack-charmers-next/trusty/neutron-api-1
+      charm: cs:trusty/neutron-api-23
       num_units: 1
       options:
         neutron-plugin: plumgrid
         neutron-security-groups: True
-        openstack-origin: cloud:trusty-kilo
         plumgrid-password: plumgrid
         plumgrid-username: plumgrid
-        plumgrid-virtual-ip: 192.168.100.250
       annotations:
         "gui-x": "500"
         "gui-y": "0"
-      to: 'lxc:plumgrid-director=0'
+      to: 'lxc:controller-node=0'
     neutron-api-plumgrid:
-      charm: cs:~plumgrid-team/trusty/neutron-api-plumgrid
+      charm: cs:~plumgrid-team/trusty/neutron-api-plumgrid-15
       options:
-        enable-metadata: True
-        #install_sources: "deb http://37.48.126.173/ build413b18/"
+        enable-metadata: "True"
+        networking-plumgrid-version: "2015.1.5rc2"
       annotations:
         "gui-x": "750"
         "gui-y": "250"
     plumgrid-director:
-      charm: cs:~plumgrid-team/trusty/plumgrid-director
+      charm: cs:~plumgrid-team/trusty/plumgrid-director-29
       num_units: 1
-      options:
-        plumgrid-virtual-ip: 192.168.100.250
-        #install_sources: "deb http://37.48.126.173/ build413b18/"
       annotations:
         "gui-x": "0"
         "gui-y": "500"
+      to:
+        - "controller-node=0"
     nova-compute:
-      charm: cs:~openstack-charmers-next/trusty/nova-compute-1
+      charm: cs:trusty/nova-compute-36
       num_units: 1
       options:
         enable-live-migration: true
         enable-resize: true
         migration-auth-type: ssh
-        openstack-origin: cloud:trusty-kilo
         manage-neutron-plugin-legacy-mode: False
         #virt-type: qemu
       annotations:
         "gui-x": "250"
         "gui-y": "250"
-      to: '0'
+      to:
+        - "compute-node=0"
     plumgrid-edge:
-      charm: cs:~plumgrid-team/trusty/plumgrid-edge
-      options:
-        metadata-shared-key: "plumgrid"
-        #install_sources: "deb http://37.48.126.173/ build413b18/"
+      charm: cs:~plumgrid-team/trusty/plumgrid-edge-25
       annotations:
         "gui-x": "500"
         "gui-y": "500"
     plumgrid-gateway:
-      charm: cs:~plumgrid-team/trusty/plumgrid-gateway
-      #options:
-        #install_sources: "deb http://37.48.126.173/ build413b18/"
+      charm: cs:~plumgrid-team/trusty/plumgrid-gateway-25
       num_units: 1
       annotations:
         "gui-x": "-500"
         "gui-y": "500"
+      to:
+        - "gateway-node=0"
+
+plumgrid-configs:
+  inherits: plumgrid-ons-phase2
+  overrides:
+    plumgrid-virtual-ip: 192.168.100.250
+
+    # Provide apt repository for PLUMgrid packages
+    install_sources: "deb http://37.48.126.173/ build500b14/"
+
+    # Use this value if pulling packages from LCM
+    #install_sources: |
+    #      - "deb http://<LCM-IP>:81/plumgrid plumgrid halfdome-500"
+    #      - "deb http://<LCM-IP>:81/plumgrid-images plumgrid halfdome-500"
+
+    #plumgrid-build:
+    #iovisor-build:
+
+    # Interfaces on gateway node for external connectivity
+    external-interfaces: '{"DEFAULT":"eth2"}'
+
+    # Uncomment for seperate fabric/data network
+    # Interfaces on all PLUMgrid nodes connected to fabric/data network
+    #fabric-interfaces: '{"DEFAULT":"eth1"}'
+    # Fabric/data network
+    #os-data-network: "192.168.101.0/24"
+
+plumgrid-kilo:
+  inherits: plumgrid-configs
+  overrides:
+    source: cloud:trusty-kilo
+    openstack-origin: cloud:trusty-kilo

=== removed file 'bundle.yaml'
--- bundle.yaml	2015-09-29 15:39:33 +0000
+++ bundle.yaml	1970-01-01 00:00:00 +0000
@@ -1,145 +0,0 @@
-series: 'trusty'
-relations:
-  - ['mysql', 'keystone']
-  - ['nova-cloud-controller', 'mysql']
-  - [nova-cloud-controller, rabbitmq-server]
-  - ['nova-cloud-controller', 'glance']
-  - ['nova-cloud-controller', 'keystone']
-  - ['nova-compute', 'nova-cloud-controller']
-  - ['nova-compute', 'mysql']
-  - ['nova-compute', 'rabbitmq-server']
-  - ['nova-compute', 'glance']
-  - ['glance', 'mysql']
-  - ['glance', 'keystone']
-  - ['glance', 'cinder']
-  - ['mysql', 'cinder']
-  - ['cinder', 'rabbitmq-server']
-  - ['cinder', 'nova-cloud-controller']
-  - ['cinder', 'keystone']
-  - ['openstack-dashboard', 'keystone']
-  - ['neutron-api', 'mysql']
-  - ['neutron-api', 'keystone']
-  - ['neutron-api', 'rabbitmq-server']
-  - ['neutron-api', 'nova-cloud-controller']
-  - ['neutron-api', 'neutron-api-plumgrid']
-  - ['neutron-api-plumgrid', 'plumgrid-edge']
-  - ['plumgrid-director', 'plumgrid-edge']
-  - ['nova-compute', 'plumgrid-edge']
-  - ['plumgrid-director', 'plumgrid-gateway']
-services:
-  mysql:
-    charm: cs:trusty/mysql-26
-    num_units: 1
-    annotations:
-      "gui-x": "-250"
-      "gui-y": "250"
-    to: 'lxc:plumgrid-director=0'
-  rabbitmq-server:
-    charm: cs:trusty/rabbitmq-server-33
-    num_units: 1
-    annotations:
-      "gui-x": "-750"
-      "gui-y": "250"
-    to: 'lxc:plumgrid-director=0'
-  keystone:
-    charm: cs:trusty/keystone-28
-    num_units: 1
-    options:
-      admin-password: plumgrid
-      openstack-origin: cloud:trusty-kilo
-    annotations:
-      "gui-x": "0"
-      "gui-y": "0"
-    to: 'lxc:plumgrid-director=0'
-  nova-cloud-controller:
-    charm: cs:~openstack-charmers-next/trusty/nova-cloud-controller-1
-    num_units: 1
-    options:
-      console-access-protocol: novnc
-      network-manager: Neutron
-      openstack-origin: cloud:trusty-kilo
-      quantum-security-groups: 'yes'
-    annotations:
-      "gui-x": "-500"
-      "gui-y": "0"
-    to: 'lxc:plumgrid-director=0'
-  glance:
-    charm: cs:trusty/glance-24
-    num_units: 1
-    options:
-      openstack-origin: cloud:trusty-kilo
-    annotations:
-      "gui-x": "-250"
-      "gui-y": "-250"
-    to: 'lxc:plumgrid-director=0'
-  openstack-dashboard:
-    charm: cs:trusty/openstack-dashboard-16
-    num_units: 1
-    options:
-      openstack-origin: cloud:trusty-kilo
-    annotations:
-      "gui-x": "0"
-      "gui-y": "-500"
-    to: 'lxc:plumgrid-director=0'
-  cinder:
-    charm: cs:trusty/cinder-26
-    num_units: 1
-    options:
-      openstack-origin: cloud:trusty-kilo
-    annotations:
-      "gui-x": "250"
-      "gui-y": "-250"
-    to: 'lxc:plumgrid-director=0'
-  neutron-api:
-    charm: cs:~openstack-charmers-next/trusty/neutron-api-1
-    num_units: 1
-    options:
-      neutron-plugin: plumgrid
-      neutron-security-groups: True
-      openstack-origin: cloud:trusty-kilo
-      plumgrid-password: plumgrid
-      plumgrid-username: plumgrid
-      plumgrid-virtual-ip: 192.168.100.250
-    annotations:
-      "gui-x": "500"
-      "gui-y": "0"
-    to: 'lxc:plumgrid-director=0'
-  neutron-api-plumgrid:
-    charm: cs:trusty/neutron-api-plumgrid-1
-    options:
-      enable-metadata: True
-    annotations:
-      "gui-x": "750"
-      "gui-y": "250"
-  plumgrid-director:
-    charm: cs:trusty/plumgrid-director-1
-    num_units: 1
-    options:
-      plumgrid-virtual-ip: 192.168.100.250
-    annotations:
-      "gui-x": "0"
-      "gui-y": "500"
-  nova-compute:
-    charm: cs:~openstack-charmers-next/trusty/nova-compute-1
-    num_units: 1
-    options:
-      enable-live-migration: true
-      enable-resize: true
-      migration-auth-type: ssh
-      openstack-origin: cloud:trusty-kilo
-      manage-neutron-plugin-legacy-mode: False
-    annotations:
-      "gui-x": "250"
-      "gui-y": "250"
-    to: '0'
-  plumgrid-edge:
-    charm: cs:trusty/plumgrid-edge-0
-    annotations:
-      "gui-x": "500"
-      "gui-y": "500"
-  plumgrid-gateway:
-    charm: cs:trusty/plumgrid-gateway-1
-    num_units: 1
-    annotations:
-      "gui-x": "-500"
-      "gui-y": "500"

=== added file 'setup_lcm.sh'
--- setup_lcm.sh	1970-01-01 00:00:00 +0000
+++ setup_lcm.sh	2016-05-17 18:38:21 +0000
@@ -0,0 +1,118 @@
+#!/bin/bash
+set -e
+
+if [ "$EUID" -ne 0 ]
+  then echo "Please run script with sudo"
+  exit
+fi
+
+function usage() {
+  cat <<DELIM__
+usage: $(basename $0) [options]
+
+Options:
+  --clobber             Will clear stored configurations and do a fresh run
+DELIM__
+}
+
+TEMP=$(getopt -o c --long ,clobber -- "$@")
+if [[ $? -ne 0 ]]; then
+  usage
+  exit 1
+fi
+
+eval set -- "$TEMP"
+
+while true; do
+  case "$1" in
+    --clobber) clobber=1; shift ;;
+    --) shift; break ;;
+    *) usage; exit 1
+      ;;
+  esac
+done
+
+mkdir -p $HOME/.pginstall
+
+function read_raw() {
+  eval "local=\$${2}"
+  if [[ -n "$local" && "$local" =~ $3 ]]; then
+    ## the value stored in the destination variable is already OK
+    echo "Using provided value [${local}] for: $1"
+    return 0
+  fi
+
+  if [[ $# -eq 5 ]]; then
+    echo -n "${1} (default [${5}])"
+    dfl="$5"
+  else
+    echo -n "${1}"
+    dfl=""
+  fi
+
+  while true; do
+    local=""
+    echo -n ": "
+    read local
+    [[ $local == "" ]] && local="$dfl"
+    if [[ "$local" =~ $3 ]]; then
+      break
+    fi
+    echo "  Please try again.  [${local}] is not a valid value: $4"
+  done
+  eval $2="\"$local\""
+}
+
+function read_nonempty() {
+  if [[ $# -eq 3 ]]; then
+    read_raw "$1" "$2" "[^ ]+" "must be non-empty" "$3"
+  else
+    read_raw "$1" "$2" "[^ ]+" "must be non-empty"
+  fi
+}
+
+function read_alnum() {
+  if [[ $# -eq 3 ]]; then
+    read_raw "$1" "$2" "^[0-9a-zA-Z]+$" "must use alphanumeric characters only" "$3"
+  else
+    read_raw "$1" "$2" "^[0-9a-zA-Z]+$" "must use alphanumeric characters only"
+  fi
+}
+
+function read_url() {
+  read_raw "$1" "$2" "^(ftp|http|https)://[^ ]+" "invalid schema (e.g. http://IP)"
+}
+
+function write_default_file() {
+  cat > $HOME/.pginstall/config <<DELIM__
+MAAS_CONTROLLER_REGION_ADMIN_USERNAME="${MAAS_CONTROLLER_REGION_ADMIN_USERNAME}"
+plumgrid_repo_url="${plumgrid_repo_url}"
+lvm_keypath_content="${lvm_keypath_content}"
+zone_name="${zone_name}"
+DELIM__
+  return 0
+}
+
+function lcm_key_check() {
+  zone_name_=${zone_name}
+  while true; do
+    zone_name="${zone_name_}"
+    read_alnum 'Enter LCM Canonical zone name' zone_name
+    read_url "Enter LCM repository base url" plumgrid_repo_url
+    echo -n "Checking ssh key on LCM for your deployment..."
+    ret=$(curl -Lks ${plumgrid_repo_url}/files/ssh_keys/zones/$zone_name/id_rsa.pub -o /tmp/id_rsa.pub -w '%{http_code}' || true)
+    [ $ret -eq 200 ] && break
+    echo "Unable to get ssh key from LCM for your deployment."
+    echo "Check zone name or retry after running canonical-pg-refresh.sh --key-only script on LCM and make sure your deployment shows up."
+    zone_name_=""
+  done
+  echo "OK"
+  mkdir -p /var/lib/plumgrid/zones/$zone_name
+  mv /tmp/id_rsa.pub /var/lib/plumgrid/zones/$zone_name/id_rsa.pub
+  lvm_keypath_content="/var/lib/plumgrid/zones/${zone_name}/id_rsa.pub"
+}
+
+[[ -r $HOME/.pginstall/config && $clobber != 1 ]] && . $HOME/.pginstall/config
+read_nonempty "Username of MAAS Region Admin User" MAAS_CONTROLLER_REGION_ADMIN_USERNAME "root"
+lcm_key_check
+write_default_file