Merge lp:~thedac/openstack-mojo-specs/rendered into lp:openstack-mojo-specs

[David Ames]

Master bundle render proof of concept spec

The rendered specs demonstrate a method to render a collected bundle on the
fly for a mojo spec.

Highlights:

* Bundles, utilities and helpers can all be collected from upstream sources in
flight and used by the mojo spec. Bundles can be rendered from a master source
and merged with stage specific overrides. This will include the ability to add
HA vip overrides.

* This method significantly reduces duplication in individual spec directories.
Only what is needed to override the defaults is required in the stage
directory. The rendered top level directory is not quite as "clean" but it
reduces redundancy and the need for sym links (almost) entirely.

* This method leverages mojo's search path algorithm which checks the most
specific to least specific and overrides with the most specific configuration,
manifest or script file.

* This method leverages mojo's manifest file inclusion capabilities to define
discrete repeatable multi-step processes that can be shared by all stages or
overridden as required.

* This method can also live side by side with the sym link versions until all are
converted.

[lp:~thedac/openstack-mojo-specs/rendered]

306. By David Ames on 2017-03-10

HA with VIPs from the environment

307. By David Ames on 2017-03-10

Generic names for specs

As we will be generating on the fly next or stable soures. We do not need
to name specs next_* or stable_*.

Add ssl spec

308. By David Ames on 2017-03-14

Use render bundle tool

Unmerged revisions

308. By David Ames on 2017-03-14

Use render bundle tool

307. By David Ames on 2017-03-10

Generic names for specs

As we will be generating on the fly next or stable soures. We do not need
to name specs next_* or stable_*.

Add ssl spec

306. By David Ames on 2017-03-10

HA with VIPs from the environment

305. By David Ames on 2017-03-09

Master bundle render proof of concept spec

=== added symlink 'helper/tests/images.yaml'
=== target is u'../setup/images.yaml'
=== modified file 'helper/tests/simple_os_checks.py'
--- helper/tests/simple_os_checks.py	2016-10-03 10:21:13 +0000
+++ helper/tests/simple_os_checks.py	2017-03-14 16:40:53 +0000
@@ -64,7 +64,6 @@
 
     priv_key = mojo_os_utils.create_keypair(novac, 'mojo')
     mojo_os_utils.add_secgroup_rules(novac)
-    print(novac.servers.list())
     for server in novac.servers.list():
         novac.servers.delete(server.id)
     for instanceset in machines:

=== added directory 'rendered'
=== added file 'rendered/POC_README.md'
--- rendered/POC_README.md	1970-01-01 00:00:00 +0000
+++ rendered/POC_README.md	2017-03-14 16:40:53 +0000
@@ -0,0 +1,30 @@
+General
+=======
+
+Master bundle render proof of concept spec
+
+The rendered specs demonstrate a method to render a collected bundle on the
+fly for a mojo spec.
+
+Highlights:
+
+* Bundles, utilities and helpers can all be collected from upstream sources in
+flight and used by the mojo spec. Bundles can be rendered from a master source
+and merged with stage specific overrides. This will include the ability to add
+HA vip overrides.
+
+* This method significantly reduces duplication in individual spec directories.
+Only what is needed to override the defaults is required in the stage
+directory. The rendered top level directory is not quite as "clean" but it
+reduces redundancy and the need for sym links (almost) entirely.
+
+* This method leverages mojo's search path algorithm which checks the most
+specific to least specific and overrides with the most specific configuration,
+manifest or script file.
+
+* This method leverages mojo's manifest file inclusion capabilities to define
+discrete repeatable multi-step processes that can be shared by all stages or
+overridden as required.
+
+* This method can also live side by side with the sym link versions until all are
+converted.

=== added directory 'rendered/base'
=== added file 'rendered/base/SPEC_INFO.txt'
--- rendered/base/SPEC_INFO.txt	1970-01-01 00:00:00 +0000
+++ rendered/base/SPEC_INFO.txt	2017-03-14 16:40:53 +0000
@@ -0,0 +1,1 @@
+Openstack Base Bundle

=== added file 'rendered/bundle-merge.py'
--- rendered/bundle-merge.py	1970-01-01 00:00:00 +0000
+++ rendered/bundle-merge.py	2017-03-14 16:40:53 +0000
@@ -0,0 +1,61 @@
+#!/usr/bin/python
+
+import argparse
+import logging
+import os
+import yaml
+
+# TODO: Add this to the bunde_reducer tool or whatever it becomes
+
+
+def get_yaml_dict(filename):
+    if os.path.isfile(filename):
+        with open(filename) as yamlfile:
+            try:
+                return yaml.load(yamlfile)
+            except yaml.parser.ParserError as e:
+                logging.error("Invalid YAML:{}".format(e))
+            except yaml.constructor.ConstructorError as e:
+                logging.error("Invalid YAML: Likely templating "
+                              "{{{{variable}}}} breaking YAML".format(e))
+    else:
+        logging.error("Not a file:", filename)
+
+
+def main():
+    parser = argparse.ArgumentParser(description=__doc__)
+    parser.add_argument('-p', '--primary', required=True)
+    parser.add_argument('-o', '--override', required=True)
+    parser.add_argument('-d', '--destination', default="merged.yaml")
+    args = parser.parse_args()
+
+    primary_data = get_yaml_dict(args.primary)
+    override_data = get_yaml_dict(args.override)
+
+    # We can not rely on a simple update at the top level.
+    # We need to be specific at the parameter level.
+    if 'services' in override_data:
+        for charm in override_data['services']:
+            if primary_data['services'].get(charm):
+                for param in override_data['services'][charm]:
+                    try:
+                        (primary_data['services'][charm][param]
+                            .update(override_data['services'][charm][param]))
+                    except KeyError:
+                        primary_data['services'][charm][param] = (
+                            override_data['services'][charm][param])
+            else:
+                primary_data['services'][charm] = (
+                            override_data['services'][charm])
+
+    # XXX: This is additive only
+    # TODO: This will need to be smarter
+    if 'relations' in override_data:
+        primary_data['relations'].extend(override_data['relations'])
+
+    with open(args.destination, 'w') as dest:
+        dest.write(yaml.dump(primary_data))
+
+
+if __name__ == "__main__":
+    main()

=== added file 'rendered/collect'
--- rendered/collect	1970-01-01 00:00:00 +0000
+++ rendered/collect	2017-03-14 16:40:53 +0000
@@ -0,0 +1,17 @@
+# Top level collect
+# Gather resources all stages will use
+
+# Collect master bundle and bunde_reducer.py
+openstack-bundles  git://github.com/thedac/openstack-bundles;revno=poc
+
+# Collect all helpers
+juju-wait git://git.launchpad.net/~thedac/juju-wait;revno=alt-binaries
+
+# This could include the entire helpers directory
+# helper git://some-new-source
+
+# We can grab individual files from github if necessary
+#render.sh https://raw.githubusercontent.com/thedac/openstack-bundles/render/tools/bundle_reducer.py
+
+# TODO Bug in mojo requires one charm. Will fix.
+ampq-client cs:~thedac/amqp-client

=== added directory 'rendered/example_override_stage'
=== added file 'rendered/example_override_stage/collect'
--- rendered/example_override_stage/collect	1970-01-01 00:00:00 +0000
+++ rendered/example_override_stage/collect	2017-03-14 16:40:53 +0000
@@ -0,0 +1,18 @@
+# Override collect
+# This collect will run rather than the top level one
+
+
+# Collect master bundle and bunde_reducer.py
+openstack-bundles  git://github.com/thedac/openstack-bundles;revno=poc
+
+# Collect all helpers
+juju-wait git://git.launchpad.net/~thedac/juju-wait;revno=alt-binaries
+
+# This could include the entire helpers directory
+# helper git://some-new-source
+
+# We can grab individual files from github if necessary
+#render.sh https://raw.githubusercontent.com/thedac/openstack-bundles/render/tools/bundle_reducer.py
+
+# TODO Bug in mojo requires one charm. Will fix.
+ampq-client cs:~thedac/amqp-client

=== added file 'rendered/example_override_stage/manifest'
--- rendered/example_override_stage/manifest	1970-01-01 00:00:00 +0000
+++ rendered/example_override_stage/manifest	2017-03-14 16:40:53 +0000
@@ -0,0 +1,25 @@
+## By naming this 'manifest' it overrides the top level manifest
+## Any other manifest or script can be overrriden in like maner
+
+# Collect everthing we need including tooling
+collect
+
+# Collect stage specific resources
+include config=stage-collect-manifest
+
+# Render the bundle based on env variables
+script config=render.sh
+
+# Deploy with the rendered bundle
+deploy config=bundle.yaml delay=0 wait=False 
+
+# Wait for deploy to settle
+verify config=juju-wait.sh
+
+# Stage specific operations
+include config=stage-operations-manifest
+
+# Stage specific operations
+include config=stage-validation-manifest
+
+# Success

=== added directory 'rendered/example_stage'
=== added file 'rendered/example_stage/stage-bundle-overrides.yaml'
--- rendered/example_stage/stage-bundle-overrides.yaml	1970-01-01 00:00:00 +0000
+++ rendered/example_stage/stage-bundle-overrides.yaml	2017-03-14 16:40:53 +0000
@@ -0,0 +1,8 @@
+# We can use stage specific yaml bits that can be consumed by
+# render.sh and/or juju-deployer
+# Only add what is different
+
+services:
+  keystone:
+    options:
+      openstack-origin: cloud:xenial-newton/proposed

=== added file 'rendered/example_stage/stage-collect'
--- rendered/example_stage/stage-collect	1970-01-01 00:00:00 +0000
+++ rendered/example_stage/stage-collect	2017-03-14 16:40:53 +0000
@@ -0,0 +1,2 @@
+# Stage specific collect
+bespoke-resource bespoke-source

=== added file 'rendered/example_stage/stage-collect-manifest'
--- rendered/example_stage/stage-collect-manifest	1970-01-01 00:00:00 +0000
+++ rendered/example_stage/stage-collect-manifest	2017-03-14 16:40:53 +0000
@@ -0,0 +1,2 @@
+# Stage specific collect
+collect config=stage-collect

=== added file 'rendered/example_stage/stage-operations-manifest'
--- rendered/example_stage/stage-operations-manifest	1970-01-01 00:00:00 +0000
+++ rendered/example_stage/stage-operations-manifest	2017-03-14 16:40:53 +0000
@@ -0,0 +1,3 @@
+# Stage specific operations
+
+# Do something bespoke

=== added file 'rendered/example_stage/stage-validation-manifest'
--- rendered/example_stage/stage-validation-manifest	1970-01-01 00:00:00 +0000
+++ rendered/example_stage/stage-validation-manifest	2017-03-14 16:40:53 +0000
@@ -0,0 +1,3 @@
+# Stage specific validation
+
+# Do bespoke validation

=== added directory 'rendered/ha'
=== added file 'rendered/ha/SPEC_INFO.txt'
--- rendered/ha/SPEC_INFO.txt	1970-01-01 00:00:00 +0000
+++ rendered/ha/SPEC_INFO.txt	2017-03-14 16:40:53 +0000
@@ -0,0 +1,12 @@
+This spec performs an HA deploy in one shot (not phased).
+It requires that the following are exported into the
+environment:
+MOJO_OS_VIP01
+MOJO_OS_VIP02
+MOJO_OS_VIP03
+MOJO_OS_VIP04
+MOJO_OS_VIP05
+MOJO_OS_VIP06
+MOJO_OS_VIP07
+MOJO_OS_VIP08
+MOJO_OS_VIP09

=== added file 'rendered/ha/preflight.py'
--- rendered/ha/preflight.py	1970-01-01 00:00:00 +0000
+++ rendered/ha/preflight.py	2017-03-14 16:40:53 +0000
@@ -0,0 +1,41 @@
+#!/usr/bin/python
+
+import logging
+import os
+import sys
+
+
+# Import the top level preflight
+sys.path.insert(0, 
+                os.path.dirname(
+                    os.path.dirname(__file__)))
+import preflight
+
+
+REQUIRED = [
+    'MOJO_OS_VIP01',
+    'MOJO_OS_VIP02',
+    'MOJO_OS_VIP03',
+    'MOJO_OS_VIP04',
+    'MOJO_OS_VIP05',
+    'MOJO_OS_VIP06',
+    'MOJO_OS_VIP07',
+    'MOJO_OS_VIP08',
+    'MOJO_OS_VIP09',
+]
+
+
+logging.info("Running stage specific pre-flight check for environment "
+             "variables")
+for var in REQUIRED:
+    if os.environ.get(var) is None:
+        raise preflight.MissingEnvVariableExeption(
+            "The variable, {}, is missing from the environment.\n"
+            "Make sure all required variables in the {} "
+            "script are available before running mojo\n\n"
+            "Required: {}"
+            "".format(var, os.path.basename(__file__),
+                      ", ".join(preflight.REQUIRED + REQUIRED)))
+
+logging.debug("All stage specific required environment variables successfully "
+              "found.")

=== added file 'rendered/ha/stage-bundle-overrides.yaml'
--- rendered/ha/stage-bundle-overrides.yaml	1970-01-01 00:00:00 +0000
+++ rendered/ha/stage-bundle-overrides.yaml	2017-03-14 16:40:53 +0000
@@ -0,0 +1,117 @@
+# Add new relations
+relations:
+- - percona-cluster
+  - percona-cluster-hacluster
+- - keystone
+  - keystone-hacluster
+- - nova-cloud-controller
+  - nova-cc-hacluster
+- - cinder
+  - cinder-hacluster
+- - glance
+  - glance-hacluster
+- - openstack-dashboard
+  - dashboard-hacluster
+- - ceilometer
+  - ceilometer-hacluster
+- - swift-proxy
+  - swift-hacluster
+
+services:
+
+  # Update existing services
+  # Use Variables to set values
+  ceilometer:
+    num_units: 3
+    options:
+      vip: "{{ MOJO_OS_VIP07 }}"
+  cinder:
+    num_units: 3
+    options:
+      vip: "{{ MOJO_OS_VIP05 }}"
+  glance:
+    num_units: 3
+    options:
+      vip: "{{ MOJO_OS_VIP09 }}"
+  keystone:
+    num_units: 3
+    options:
+      vip: "{{ MOJO_OS_VIP02 }}"
+  percona-cluster:
+    num_units: 3
+    options:
+      vip: "{{ MOJO_OS_VIP01 }}"
+  neutron-api:
+    num_units: 3
+    options:
+      vip: "{{ MOJO_OS_VIP08 }}"
+  nova-cloud-controller:
+    num_units: 3
+    options:
+      vip: "{{ MOJO_OS_VIP04 }}"
+  openstack-dashboard:
+    num_units: 3
+    options:
+      vip: "{{ MOJO_OS_VIP03 }}"
+  rabbitmq-server:
+    num_units: 3
+  swift-proxy:
+    num_units: 3
+    options:
+      vip: "{{ MOJO_OS_VIP06 }}"
+
+  # Add new services
+  ceilometer-hacluster:
+    charm: "cs:~openstack-charmers-next/{{ MOJO_SERIES }}/hacluster"
+    series: "{{ MOJO_SERIES }}"
+    options:
+      cluster_count: 3
+      corosync_transport: unicast
+  cinder-hacluster:
+    charm: "cs:~openstack-charmers-next/{{ MOJO_SERIES }}/hacluster"
+    series: "{{ MOJO_SERIES }}"
+    options:
+      cluster_count: 3
+      corosync_transport: unicast
+  dashboard-hacluster:
+    charm: "cs:~openstack-charmers-next/{{ MOJO_SERIES }}/hacluster"
+    series: "{{ MOJO_SERIES }}"
+    options:
+      cluster_count: 3
+      corosync_transport: unicast
+  glance-hacluster:
+    charm: "cs:~openstack-charmers-next/{{ MOJO_SERIES }}/hacluster"
+    series: "{{ MOJO_SERIES }}"
+    options:
+      cluster_count: 3
+      corosync_transport: unicast
+  keystone-hacluster:
+    charm: "cs:~openstack-charmers-next/{{ MOJO_SERIES }}/hacluster"
+    series: "{{ MOJO_SERIES }}"
+    options:
+      cluster_count: 3
+      corosync_transport: unicast
+  neutron-hacluster:
+    charm: "cs:~openstack-charmers-next/{{ MOJO_SERIES }}/hacluster"
+    series: "{{ MOJO_SERIES }}"
+    options:
+      cluster_count: 3
+      corosync_transport: unicast
+  nova-cc-hacluster:
+    charm: "cs:~openstack-charmers-next/{{ MOJO_SERIES }}/hacluster"
+    series: "{{ MOJO_SERIES }}"
+    options:
+      cluster_count: 3
+      corosync_transport: unicast
+  percona-cluster-hacluster:
+    charm: "cs:~openstack-charmers-next/{{ MOJO_SERIES }}/hacluster"
+    series: "{{ MOJO_SERIES }}"
+    options:
+      cluster_count: 3
+      corosync_transport: unicast
+  swift-hacluster:
+    charm: "cs:~openstack-charmers-next/{{ MOJO_SERIES }}/hacluster"
+    series: "{{ MOJO_SERIES }}"
+    options:
+      corosync_transport: unicast
+      cluster_count: 3

=== added file 'rendered/juju-wait.sh'
--- rendered/juju-wait.sh	1970-01-01 00:00:00 +0000
+++ rendered/juju-wait.sh	2017-03-14 16:40:53 +0000
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+# TODO: We can make the timeout an env variable.
+# Maybe it already is in OSCI.
+# Call upstream juju-wait with correct switches
+${MOJO_BUILD_DIR}/juju-wait/juju-wait -t 2700 -w -v

=== added directory 'rendered/l3ha'
=== added file 'rendered/l3ha/SPEC_INFO.txt'
--- rendered/l3ha/SPEC_INFO.txt	1970-01-01 00:00:00 +0000
+++ rendered/l3ha/SPEC_INFO.txt	2017-03-14 16:40:53 +0000
@@ -0,0 +1,3 @@
+This spec deploys with neutron L3 HA (VRRP) enabled.
+It requires that NETWORK_TOPOLOGY=vrrpha is exported into the
+environment.

=== added file 'rendered/l3ha/preflight.py'
--- rendered/l3ha/preflight.py	1970-01-01 00:00:00 +0000
+++ rendered/l3ha/preflight.py	2017-03-14 16:40:53 +0000
@@ -0,0 +1,33 @@
+#!/usr/bin/python
+
+import logging
+import os
+import sys
+
+
+# Import the top level preflight
+sys.path.insert(0, 
+                os.path.dirname(
+                    os.path.dirname(__file__)))
+import preflight
+
+
+REQUIRED = [
+  'NET_TOPOLOGY'
+]
+
+
+logging.info("Running stage specific pre-flight check for environment "
+             "variables")
+for var in REQUIRED:
+    if os.environ.get(var) is None:
+        raise preflight.MissingEnvVariableExeption(
+            "The variable, {}, is missing from the environment.\n"
+            "Make sure all required variables in the {} "
+            "script are available before running mojo\n\n"
+            "Required: {}"
+            "".format(var, os.path.basename(__file__),
+                      ", ".join(preflight.REQUIRED + REQUIRED)))
+
+logging.debug("All stage specific required environment variables successfully "
+              "found.")

=== added file 'rendered/l3ha/stage-bundle-overrides.yaml'
--- rendered/l3ha/stage-bundle-overrides.yaml	1970-01-01 00:00:00 +0000
+++ rendered/l3ha/stage-bundle-overrides.yaml	2017-03-14 16:40:53 +0000
@@ -0,0 +1,11 @@
+services:
+  neutron-api:
+    options:
+      overlay-network-type: 'vxlan'
+      l2-population: False
+      neutron-security-groups: True
+      enable-dvr: False
+      enable-l3ha: True
+      flat-network-providers: physnet1
+  neutron-gateway:
+    num_units: 2

=== added file 'rendered/l3ha/stage-validation-manifest'
--- rendered/l3ha/stage-validation-manifest	1970-01-01 00:00:00 +0000
+++ rendered/l3ha/stage-validation-manifest	2017-03-14 16:40:53 +0000
@@ -0,0 +1,2 @@
+# Test guest connectivity after stopping and starting gateway
+verify config=../../helper/tests/test_vrrp_ha.py

=== added file 'rendered/manifest'
--- rendered/manifest	1970-01-01 00:00:00 +0000
+++ rendered/manifest	2017-03-14 16:40:53 +0000
@@ -0,0 +1,37 @@
+# Run pre-flight to check if we have all the right variables in the environment
+script config=preflight.py
+
+# Collect everthing we need including tooling
+collect
+
+## TODO: simple mojo change will allow using $MOJO_BUILD_DIR
+## to call collected scripts directly from the manifest
+##script config=${MOJO_BUILD_DIR}/hello.sh
+
+# Collect stage specific resources
+include config=stage-collect-manifest
+
+# Render the bundle based on env variables
+script config=render.sh
+
+# Deploy with the rendered bundle
+## In theory we could use local=override-file.yaml but without a target=
+## juju-deployer gets confused
+deploy config=bundle.yaml delay=0 wait=False 
+
+# Wait for deploy to settle
+verify config=juju-wait.sh
+
+# Setup the cloud
+include config=setup-manifest
+
+# Validate the cloud
+include config=validation-manifest
+
+# Stage specific operations
+include config=stage-operations-manifest
+
+# Stage specific operations
+include config=stage-validation-manifest
+
+# Success

=== added file 'rendered/preflight.py'
--- rendered/preflight.py	1970-01-01 00:00:00 +0000
+++ rendered/preflight.py	2017-03-14 16:40:53 +0000
@@ -0,0 +1,36 @@
+#!/usr/bin/python
+
+import logging
+import os
+
+
+REQUIRED = [
+  'MOJO_OS_RELEASE',
+  'MOJO_STAGE',
+  'MOJO_WORKSPACE',
+  'MOJO_PROJECT',
+  'MOJO_SERIES',
+  'MOJO_SPEC',
+  'OS_REGION_NAME',
+  'OS_PASSWORD',
+  'OS_AUTH_URL',
+  'OS_USERNAME',
+  'OS_TENANT_NAME',
+]
+
+
+class MissingEnvVariableExeption(Exception):
+    pass
+
+logging.info("Running pre-flight check for environment variables")
+for var in REQUIRED:
+    if os.environ.get(var) is None:
+        raise MissingEnvVariableExeption(
+            "The variable, {}, is missing from the environment.\n"
+            "Make sure all required variables in the {} "
+            "script are available before running mojo\n\n"
+            "Required: {}"
+            "".format(var, os.path.basename(__file__),
+                      ", ".join(REQUIRED)))
+
+logging.debug("All required environment variables successfully found.")

=== added file 'rendered/render.sh'
--- rendered/render.sh	1970-01-01 00:00:00 +0000
+++ rendered/render.sh	2017-03-14 16:40:53 +0000
@@ -0,0 +1,22 @@
+#!/bin/bash
+
+# Render a bundle given environment variables
+# This can be expanded for more permutations
+
+# XXX Note: we are passing MOJO_OS_RELEASE as an env variable
+# which releases us from the tedious directory structure
+
+# TODO: More complex operations can be exeucted
+
+if [ -z "$MOJO_SOURCE" ]; then
+    MOJO_SOURCE="next"
+fi
+
+# Render collected bundle
+${MOJO_BUILD_DIR}/openstack-bundles/tools/render_bundle.py \
+        -b ${MOJO_BUILD_DIR}/openstack-bundles/render/source_bundle.yaml \
+        -t ${MOJO_SERIES}-${MOJO_OS_RELEASE} \
+        -src $MOJO_SOURCE \
+        -o ${MOJO_SPEC_DIR}/${MOJO_STAGE}/stage-bundle-overrides.yaml \
+        -d ${MOJO_SPEC_DIR}/${MOJO_STAGE}/bundle.yaml \
+        -l DEBUG

=== added file 'rendered/setup-manifest'
--- rendered/setup-manifest	1970-01-01 00:00:00 +0000
+++ rendered/setup-manifest	2017-03-14 16:40:53 +0000
@@ -0,0 +1,8 @@
+# Create sdn on overcloud
+script config=../helper/setup/network_setup.py
+
+# Setup glance images
+script config=../helper/setup/image_setup.py
+
+# Setup keystone users
+script config=../helper/setup/keystone_setup.py

=== added directory 'rendered/ssl'
=== added file 'rendered/ssl/SPEC_INFO.txt'
--- rendered/ssl/SPEC_INFO.txt	1970-01-01 00:00:00 +0000
+++ rendered/ssl/SPEC_INFO.txt	2017-03-14 16:40:53 +0000
@@ -0,0 +1,1 @@
+This spec performs a non-ha deploy with ssl enabled.

=== added file 'rendered/ssl/stage-bundle-overrides.yaml'
--- rendered/ssl/stage-bundle-overrides.yaml	1970-01-01 00:00:00 +0000
+++ rendered/ssl/stage-bundle-overrides.yaml	2017-03-14 16:40:53 +0000
@@ -0,0 +1,8 @@
+services:
+  rabbitmq-server:
+    options:
+      ssl: "only"
+  keystone:
+    options:
+      https-service-endpoints: "True"
+      use-https: "yes"

=== added file 'rendered/stage-collect-manifest'
--- rendered/stage-collect-manifest	1970-01-01 00:00:00 +0000
+++ rendered/stage-collect-manifest	2017-03-14 16:40:53 +0000
@@ -0,0 +1,1 @@
+## noop stage collect manifest

=== added file 'rendered/stage-operations-manifest'
--- rendered/stage-operations-manifest	1970-01-01 00:00:00 +0000
+++ rendered/stage-operations-manifest	2017-03-14 16:40:53 +0000
@@ -0,0 +1,1 @@
+## noop stage operations manifest

=== added file 'rendered/stage-validation-manifest'
--- rendered/stage-validation-manifest	1970-01-01 00:00:00 +0000
+++ rendered/stage-validation-manifest	2017-03-14 16:40:53 +0000
@@ -0,0 +1,1 @@
+## noop stage validation manifest

=== added file 'rendered/validation-manifest'
--- rendered/validation-manifest	1970-01-01 00:00:00 +0000
+++ rendered/validation-manifest	2017-03-14 16:40:53 +0000
@@ -0,0 +1,5 @@
+# Create 1 * tiny cirros and 1 * small trusty instances on the overcloud
+verify config=../helper/tests/simple_os_checks.py MACHINES='cirros:m1.tiny:1 trusty:m1.small:1' CLOUDINIT_WAIT="300"
+
+# Test obj store by sending and recieving files
+verify config=../helper/tests/test_obj_store.py