egon 0.3.6 → 0.4.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MDEyMDliOWIzOTVhZDM3MDdlNzJmZDczNTdjZDhlYWNjNTlmN2EwNQ==
+    ODI2YTNiNDM5NGU1NTBlZTc3NGM5M2ViNjI2YWEyNzg4ZDRhZDg2ZA==
   data.tar.gz: !binary |-
-    YWUyMmNlNmE0MzEzN2E5MjFhYTg3NDZkNDg1MDI5MDkyNzUzNTg4Zg==
+    MTJlMDY5OTA1YTk3MzgwNWJkNTk4ZWMxZmIwMGFjNjJhOTkyYTRjMg==
 SHA512:
   metadata.gz: !binary |-
-    ZWU0NjU5MWQwMTA0NmYyYjZkYmEzMTI2YTllMDg2ZWIxYTA5ZGI3ZGY4NzM4
-    NTU4MjQ0MWRhODU5NzI4YjQ2YWFlOTI4MzkzZjlmZTgwNjZlYTcxZGZlYjJj
-    ZTYyMWViMDNmNTUzMDZmZDliNDJmYWUyNzkzMzYzZGY3NDgxOGI=
+    MGJlYjMyNzhlYTc2ZWE1Nzc3ZjFhMWZjM2U1YTA3MmMyZmE2NzEzOTA3YTVk
+    MzAyMDNkOGM0ZGFiMmU4OWY5ZDg4YjIwYTQzYjM1ZjMyZmIyYjg4NWY0Y2Rh
+    Y2RlZjA5MzA5ZmZhZjQ1MGQ4ZjgwNTRlYzc3MmNlYmFlYWM2ODM=
   data.tar.gz: !binary |-
-    NTAxY2YyNDg1ZGE5MTJmNmI2NzhlZmI4ZWRhZWI4YzU1MTY1NGMxNjI0NzNl
-    Mzk2OWIyYzExYzYwNWNlMjI1MzQxMzNlOTQxYzc0YzAyZDJhYTZhZjQzYTg3
-    NGU3ODM0Mjg4YTA5ZTJhMjA0ZjZjMDRkNzkxMWQwZWRlZmI2NmI=
+    MTVkOWFjOWM5MjZiYTJiNDhhMWNkMGFmYzNkMTZlYTk3YWJiNmRmMzQzZGVh
+    OTdmZDI0MjU2MWY1MmFkMzk2MzI3Mzg5N2I4OTBjODBkZDVjNDExY2NiMDUx
+    YjljNTI0NmYyZjU0MjQ0YTk1YTJjNTE2OTAxMmM2Y2VkYzc4MGI=

data/lib/egon/undercloud/commands.rb

@@ -25,7 +25,202 @@ module Egon
       def self.OSP7_instack_virt
         return OSP7_COMMON
       end
-    
+
+      POST_INSTALL = "
+      source stackrc
+      source tripleo-undercloud-passwords
+
+      tripleo setup-overcloud-passwords -o tripleo-overcloud-passwords
+      source tripleo-overcloud-passwords
+      NeutronFlatNetworks=${NeutronFlatNetworks:-'datacentre'}
+      NeutronPhysicalBridge=${NeutronPhysicalBridge:-'br-ex'}
+      NeutronBridgeMappings=${NeutronBridgeMappings:-'datacentre:br-ex'}
+      # Define the interface that will be bridged onto the Neutron defined
+      # network.
+      NeutronPublicInterface=${NeutronPublicInterface:-nic1}
+      HypervisorNeutronPublicInterface=${HypervisorNeutronPublicInterface:-$NeutronPublicInterface}
+      NEUTRON_NETWORK_TYPE=${NEUTRON_NETWORK_TYPE:-gre}
+      NEUTRON_TUNNEL_TYPES=${NEUTRON_TUNNEL_TYPES:-gre}
+      # Define the overcloud libvirt type for virtualization. kvm for
+      # baremetal, qemu for an overcloud running in vm's.
+      OVERCLOUD_LIBVIRT_TYPE=${OVERCLOUD_LIBVIRT_TYPE:-qemu}
+      NtpServer=${NtpServer:-""}
+      CONTROLSCALE=${CONTROLSCALE:-1}
+      COMPUTESCALE=${COMPUTESCALE:-1}
+      CEPHSTORAGESCALE=${CEPHSTORAGESCALE:-0}
+      BLOCKSTORAGESCALE=${BLOCKSTORAGESCALE:-0}
+      SWIFTSTORAGESCALE=${SWIFTSTORAGESCALE:-0}
+
+      # Default all image parameters to use overcloud-full
+      OVERCLOUD_CONTROLLER_IMAGE=${OVERCLOUD_CONTROLLER_IMAGE:-overcloud-full}
+      OVERCLOUD_COMPUTE_IMAGE=${OVERCLOUD_COMPUTE_IMAGE:-overcloud-full}
+      OVERCLOUD_BLOCKSTORAGE_IMAGE=${OVERCLOUD_BLOCKSTORAGE_IMAGE:-overcloud-full}
+      OVERCLOUD_SWIFTSTORAGE_IMAGE=${OVERCLOUD_SWIFTSTORAGE_IMAGE:-overcloud-full}
+      OVERCLOUD_CEPHSTORAGE_IMAGE=${OVERCLOUD_CEPHSTORAGE_IMAGE:-overcloud-full}
+
+      # Default flavor parameters
+      export OVERCLOUD_CONTROL_FLAVOR=${OVERCLOUD_CONTROL_FLAVOR:-\"baremetal\"}
+      export OVERCLOUD_COMPUTE_FLAVOR=${OVERCLOUD_COMPUTE_FLAVOR:-\"baremetal\"}
+      export OVERCLOUD_CEPHSTORAGE_FLAVOR=${OVERCLOUD_CEPHSTORAGE_FLAVOR:-\"baremetal\"}
+      # Even though we are not deploying nodes with these roles, the templates will
+      # still validate that a flavor exists, so just use the baremetal_compute flavor
+      # for now.
+      export OVERCLOUD_BLOCKSTORAGE_FLAVOR=${OVERCLOUD_BLOCKSTORAGE_FLAVOR:-\"baremetal\"}
+      export OVERCLOUD_SWIFTSTORAGE_FLAVOR=${OVERCLOUD_SWIFTSTORAGE_FLAVOR:-\"baremetal\"}
+
+      export OVERCLOUD_RESOURCE_REGISTRY=${OVERCLOUD_RESOURCE_REGISTRY:-\"/usr/share/openstack-tripleo-heat-templates/overcloud-resource-registry-puppet.yaml\"}
+      NeutronControlPlaneID=$(neutron net-show ctlplane | grep ' id ' | awk '{print $4}')
+
+      export OVERCLOUD_EXTRA=${OVERCLOUD_EXTRA:-""}
+
+      PLAN_ID=$(tuskar plan-show overcloud | awk '$2==\"uuid\" {print $4}')
+      if [ -n \"$PLAN_ID\" ]; then
+          tuskar plan-delete $PLAN_ID
+      fi
+
+      tuskar plan-create overcloud
+      PLAN_ID=$(tuskar plan-show overcloud | awk '$2==\"uuid\" {print $4}')
+
+      CONTROLLER_ID=$(tuskar role-list | awk '$4==\"Controller\" {print $2}')
+      COMPUTE_ID=$(tuskar role-list | awk '$4==\"Compute\" {print $2}')
+      SWIFT_ID=$(tuskar role-list | awk '$4==\"Swift-Storage\" {print $2}')
+      CINDER_ID=$(tuskar role-list | awk '$4==\"Cinder-Storage\" {print $2}')
+      CEPH_ID=$(tuskar role-list | awk '$4==\"Ceph-Storage\" {print $2}')
+
+      tuskar plan-add-role $PLAN_ID -r $CONTROLLER_ID
+      tuskar plan-add-role $PLAN_ID -r $COMPUTE_ID
+      tuskar plan-add-role $PLAN_ID -r $SWIFT_ID
+      tuskar plan-add-role $PLAN_ID -r $CINDER_ID
+      tuskar plan-add-role $PLAN_ID -r $CEPH_ID
+
+      export TUSKAR_PARAMETERS=${TUSKAR_PARAMETERS:-\"
+      -A NeutronControlPlaneID=${NeutronControlPlaneID}
+      -A Controller-1::AdminPassword=${OVERCLOUD_ADMIN_PASSWORD}
+      -A Controller-1::AdminToken=${OVERCLOUD_ADMIN_TOKEN}
+      -A Compute-1::AdminPassword=${OVERCLOUD_ADMIN_PASSWORD}
+      -A Controller-1::SnmpdReadonlyUserPassword=${UNDERCLOUD_CEILOMETER_SNMPD_PASSWORD}
+      -A Cinder-Storage-1::SnmpdReadonlyUserPassword=${UNDERCLOUD_CEILOMETER_SNMPD_PASSWORD}
+      -A Swift-Storage-1::SnmpdReadonlyUserPassword=${UNDERCLOUD_CEILOMETER_SNMPD_PASSWORD}
+      -A Compute-1::SnmpdReadonlyUserPassword=${UNDERCLOUD_CEILOMETER_SNMPD_PASSWORD}
+      -A Controller-1::CeilometerPassword=${OVERCLOUD_CEILOMETER_PASSWORD}
+      -A Controller-1::CeilometerMeteringSecret=${OVERCLOUD_CEILOMETER_SECRET}
+      -A Compute-1::CeilometerPassword=${OVERCLOUD_CEILOMETER_PASSWORD}
+      -A Compute-1::CeilometerMeteringSecret=${OVERCLOUD_CEILOMETER_SECRET}
+      -A Controller-1::CinderPassword=${OVERCLOUD_CINDER_PASSWORD}
+      -A Controller-1::GlancePassword=${OVERCLOUD_GLANCE_PASSWORD}
+      -A Controller-1::HeatPassword=${OVERCLOUD_HEAT_PASSWORD}
+      -A Controller-1::NeutronPassword=${OVERCLOUD_NEUTRON_PASSWORD}
+      -A Compute-1::NeutronPassword=${OVERCLOUD_NEUTRON_PASSWORD}
+      -A Controller-1::NovaPassword=${OVERCLOUD_NOVA_PASSWORD}
+      -A Compute-1::NovaPassword=${OVERCLOUD_NOVA_PASSWORD}
+      -A Controller-1::SwiftHashSuffix=${OVERCLOUD_SWIFT_HASH}
+      -A Controller-1::SwiftPassword=${OVERCLOUD_SWIFT_PASSWORD}
+      -A Controller-1::CinderISCSIHelper=lioadm
+      -A Cinder-Storage-1::CinderISCSIHelper=lioadm
+      -A Controller-1::CloudName=overcloud
+      -A Controller-1::NeutronPublicInterface=$NeutronPublicInterface
+      -A Controller-1::NeutronBridgeMappings=$NeutronBridgeMappings
+      -A Compute-1::NeutronBridgeMappings=$NeutronBridgeMappings
+      -A Controller-1::NeutronFlatNetworks=$NeutronFlatNetworks
+      -A Compute-1::NeutronFlatNetworks=$NeutronFlatNetworks
+      -A Compute-1::NeutronPhysicalBridge=$NeutronPhysicalBridge
+      -A Compute-1::NeutronPublicInterface=$NeutronPublicInterface
+      -A Compute-1::NovaComputeLibvirtType=$OVERCLOUD_LIBVIRT_TYPE
+      -A Controller-1::NtpServer=${NtpServer}
+      -A Compute-1::NtpServer=${NtpServer}
+      -A Controller-1::NeutronNetworkType=${NEUTRON_NETWORK_TYPE}
+      -A Compute-1::NeutronNetworkType=${NEUTRON_NETWORK_TYPE}
+      -A Controller-1::NeutronTunnelTypes=${NEUTRON_TUNNEL_TYPES}
+      -A Compute-1::NeutronTunnelTypes=${NEUTRON_TUNNEL_TYPES}
+      -A Controller-1::count=${CONTROLSCALE}
+      -A Compute-1::count=${COMPUTESCALE}
+      -A Swift-Storage-1::count=${SWIFTSTORAGESCALE}
+      -A Cinder-Storage-1::count=${BLOCKSTORAGESCALE}
+      -A Ceph-Storage-1::count=${CEPHSTORAGESCALE}
+      -A Cinder-Storage-1::Flavor=${OVERCLOUD_BLOCKSTORAGE_FLAVOR}
+      -A Compute-1::Flavor=${OVERCLOUD_COMPUTE_FLAVOR}
+      -A Controller-1::Flavor=${OVERCLOUD_CONTROL_FLAVOR}
+      -A Swift-Storage-1::Flavor=${OVERCLOUD_SWIFTSTORAGE_FLAVOR}
+      -A Ceph-Storage-1::Flavor=${OVERCLOUD_CEPHSTORAGE_FLAVOR}
+      -A Swift-Storage-1::Image=${OVERCLOUD_SWIFTSTORAGE_IMAGE}
+      -A Cinder-Storage-1::Image=${OVERCLOUD_BLOCKSTORAGE_IMAGE}
+      -A Ceph-Storage-1::Image=${OVERCLOUD_BLOCKSTORAGE_IMAGE}
+      -A Controller-1::Image=${OVERCLOUD_CONTROLLER_IMAGE}
+      -A Compute-1::Image=${OVERCLOUD_COMPUTE_IMAGE}
+      \"}
+
+      if [ $CONTROLSCALE -gt 1 ]; then
+          export TUSKAR_PARAMETERS=\"$TUSKAR_PARAMETERS
+          -A Controller-1::NeutronL3HA=True
+          -A Controller-1::NeutronAllowL3AgentFailover=False
+          -A Compute-1::NeutronL3HA=True
+          -A Compute-1::NeutronAllowL3AgentFailover=False
+          \"
+      fi
+
+      if [ $CEPHSTORAGESCALE -gt 0 ]; then
+          FSID=$(uuidgen)
+          MON_KEY=$(create_cephx_key)
+          ADMIN_KEY=$(create_cephx_key)
+          CINDER_ISCSI=${CINDER_ISCSI:-0}
+          export TUSKAR_PARAMETERS=\"$TUSKAR_PARAMETERS
+          -A Controller-1::CinderEnableRbdBackend=True
+          -A Controller-1::GlanceBackend=rbd
+          -A CephClusterFSID=$FSID
+          -A CephMonKey=$MON_KEY
+          -A CephAdminKey=$ADMIN_KEY
+          -A Compute-1::NovaEnableRbdBackend=True
+          \"
+
+          if [ $CINDER_ISCSI -eq 0 ]; then
+              export TUSKAR_PARAMETERS=\"$TUSKAR_PARAMETERS
+              -A Controller-1::CinderEnableIscsiBackend=false
+              \"
+          else
+              # (this is the default parameter value)
+              export TUSKAR_PARAMETERS=\"$TUSKAR_PARAMETERS
+                     -A Controller-1::CinderEnableIscsiBackend=true
+                     \"
+          fi
+      fi
+
+      tuskar plan-update $TUSKAR_PARAMETERS $PLAN_ID
+
+      # Added next to parameters as they are required
+      TIMEOUT=5
+      HEAT_OP=\"stack-create\"
+
+      HEAT_ENV=${HEAT_ENV:-\"overcloud-env.json\"}
+
+      if [ -f $HEAT_ENV -a \"$HEAT_OP\" = \"stack-update\" ]; then
+          ENV_JSON=$(cat $HEAT_ENV)
+      else
+          ENV_JSON='{\"parameters\":{}}'
+      fi
+
+      jq . > \"${HEAT_ENV}\" <<< $ENV_JSON
+      chmod 0600 \"${HEAT_ENV}\"
+
+      if [ \"$HEAT_OP\" = \"stack-create\" ]; then
+        generate-keystone-pki --heatenv $HEAT_ENV
+      fi
+
+      KeystoneCACertificate=$(os-apply-config -m $HEAT_ENV --key parameters.KeystoneCACertificate --type raw)
+      KeystoneSigningCertificate=$(os-apply-config -m $HEAT_ENV --key parameters.KeystoneSigningCertificate --type raw)
+      KeystoneSigningKey=$(os-apply-config -m $HEAT_ENV --key parameters.KeystoneSigningKey --type raw)
+
+      # Sending the Certificates one by one, otherwise there are problems with escaping
+      tuskar plan-update -A Controller-1::KeystoneCACertificate=\"${KeystoneCACertificate}\" $PLAN_ID
+      tuskar plan-update -A Controller-1::KeystoneSigningCertificate=\"${KeystoneSigningCertificate}\" $PLAN_ID
+      tuskar plan-update -A Controller-1::KeystoneSigningKey=\"${KeystoneSigningKey}\" $PLAN_ID
+
+      # Get templates from tuskar
+      tuskar plan-templates -O tuskar_templates $PLAN_ID
+
+      OVERCLOUD_YAML_PATH=\"tuskar_templates/plan.yaml\"
+      ENVIRONMENT_YAML_PATH=\"tuskar_templates/environment.yaml\"
+      "
+
       OSP7_COMMON = "
       sudo yum install -y http://dl.fedoraproject.org/pub/epel/7/x86_64/e/epel-release-7-5.noarch.rpm
       sudo yum install -y https://rdoproject.org/repos/openstack-kilo/rdo-release-kilo.rpm
@@ -38,7 +233,8 @@ module Egon
       sudo cp /root/tripleo-undercloud-passwords .
       sudo chown $USER: tripleo-undercloud-passwords
       sudo cp /root/stackrc .
-      sudo chown $USER: stackrc"
+      sudo chown $USER: stackrc
+      #{POST_INSTALL}"
     end
   end  
 end

data/lib/egon/version.rb

@@ -1,3 +1,3 @@
 module Egon
-  VERSION = "0.3.6"
+  VERSION = "0.4.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: egon
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.4.0
 platform: ruby
 authors:
 - Egon and Fusor team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-30 00:00:00.000000000 Z
+date: 2015-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler