richm

diff --git a/packstack/plugins/keystone_100.py b/packstack/plugins/keystone_100.
index 7440ec9..718337d 100644
--- a/packstack/plugins/keystone_100.py
+++ b/packstack/plugins/keystone_100.py
@@ -87,6 +87,19 @@ def initConfig(controller):
          "USE_DEFAULT": True,
          "NEED_CONFIRM": False,
          "CONDITION": False},
+
+        {"CMD_OPTION": "keystone-use-wsgi",

richm

diff --git a/bin/foreman_server.sh b/bin/foreman_server.sh
index 95550e7..f814171 100755
--- a/bin/foreman_server.sh
+++ b/bin/foreman_server.sh
@@ -1,10 +1,12 @@
 #!/bin/bash
 
-echo "#################### RED HAT OPENSTACK #####################"
-echo "Thank you for using the Red Hat OpenStack Foreman Installer!"
-echo "############################################################"

richm

class fooclass (
  $foo = "using default"
) {
  warning("foo = [$foo]")
}

class { 'fooclass': foo => hiera('does not exist', undef) }

# This prints Warning: foo = []

richm

  def self.get_session(credentials)
    @session =|| get_private_session(credentials)
    @session
  end

  def self.get_private_session(credentials)
    configuration = make_configuration(credentials)
    session = ::Aviator::Session.new(:config => configuration)
    session.authenticate unless credentials.nil?
    session

richm

diff --git a/lib/puppet/provider/openstack.rb b/lib/puppet/provider/openstack.rb
index 4fcd377..2be4d5b 100644
--- a/lib/puppet/provider/openstack.rb
+++ b/lib/puppet/provider/openstack.rb
@@ -1,4 +1,5 @@
 require 'puppet'
+require 'csv'
 
 class Puppet::Error::OpenstackRequestError < Puppet::Error
 end

richm

diff --git a/.fixtures.yml b/.fixtures.yml
index 34dd37c..862ed07 100644
--- a/.fixtures.yml
+++ b/.fixtures.yml
@@ -6,7 +6,6 @@ fixtures:
     'mysql':
       repo: 'git://github.com/puppetlabs/puppetlabs-mysql.git'
       ref:  'origin/2.2.x'
-    'openstacklib': 'git://github.com/stackforge/puppet-openstacklib.git'
     'stdlib': 'git://github.com/puppetlabs/puppetlabs-stdlib.git'

richm

When it works, this is the docker command:
docker run -it --rm  --privileged -v /home/rmeggins/bitscout/efk-atomicapp/run:/atomicapp -v /run:/run -v /:/host \
  --net=host --name efk-atomicapp -e NAME=efk-atomicapp -e IMAGE=bitscout/efk-atomicapp \
  bitscout/efk-atomicapp -v  run  /atomicapp

This is the RUN label added by the commit:

      RUN="docker run --rm \${OPT1} --privileged -v `pwd`:/atomicapp -v /run:/run -v /:/host --net=host --name \${NAME} -e NAME=\${NAME} -e IMAGE=\${IMAGE} \${IMAGE} -v \${OPT2} run \${OPT3} \${IMAGE}"

When it fails using the above, this is the docker command:

richm

I0223 16:45:16.436816       1 common.go:134] Running post commit hook with image test/ruby-sample-build-1:b192773d ...
/bin/sh: bundle: command not found
F0223 16:45:22.239957       1 builder.go:204] Error: build error: container "openshift_s2i-build_ruby-sample-build-1_test_post-commit" returned non-zero exit code: 127

richm

# oc describe dc/docker-registry
Name:           docker-registry
Created:        About an hour ago
Labels:         docker-registry=default
Annotations:    <none>
Latest Version: 1
Triggers:       Config
Strategy:       Rolling
Template:
  Selector:     docker-registry=default

richm

# cat /etc/systemd/system/multi-user.target.wants/openshift.service 
[Unit]
Description=OpenShift All-In-One server
After=network.target
After=docker.service
Requires=network.target
Requires=docker.service

[Service]
Type=simple