Added contrail-tripleo-puppet module for node-init

Change-Id: Ic2341e496d2216bc575060ffff7de7280a307e30 Partial-Bug: #1782251
Juniper · Jul 30, 2018 · 224b78c · 224b78c
1 parent 9656040
commit 224b78c
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 9 deletions.
diff --git a/containers/node-init/Dockerfile b/containers/node-init/Dockerfile
@@ -5,6 +5,7 @@ FROM ${CONTRAIL_REGISTRY}/contrail-base:${CONTRAIL_CONTAINER_TAG}
 ARG CONTAINER_NAME
 
 RUN yum install -y openssl && \
+    yum install -y --downloadonly --downloaddir=/ contrail-tripleo-puppet && \
     yum clean all && \
     rm -rf /var/cache/yum
 

diff --git a/containers/node-init/entrypoint.sh b/containers/node-init/entrypoint.sh
@@ -8,4 +8,6 @@ ret=0
 
 /certs-init.sh || ret=1
 
+/files-init.sh || ret=1
+
 exit $ret
diff --git a/containers/node-init/files-init.sh b/containers/node-init/files-init.sh
@@ -0,0 +1,13 @@
+#!/bin/bash -x
+
+source /common.sh
+
+# Copy RPM of puppet module into the provided folder
+# for now it is used in case of OSP13 where this folder is
+# bind to the host directory.
+INSTALL_PUPPET=${INSTALL_PUPPET:-false}
+INSTALL_PUPPET_DIR=${INSTALL_PUPPET_DIR:-'/tmp'}
+if is_enabled "$INSTALL_PUPPET" ; then
+  mkdir -p $INSTALL_PUPPET_DIR
+  cp -f /contrail-tripleo-puppet*.rpm $INSTALL_PUPPET_DIR
+fi
diff --git a/containers/openstack/heat-init/Dockerfile b/containers/openstack/heat-init/Dockerfile
@@ -4,7 +4,7 @@ FROM ${CONTRAIL_REGISTRY}/contrail-base:${CONTRAIL_CONTAINER_TAG}
 
 ARG CONTAINER_NAME
 
-RUN yum install -y contrail-heat \
+RUN yum install -y contrail-heat && \
     yum clean all -y && \
     rm -rf /var/cache/yum
 

diff --git a/containers/openstack/heat-init/entrypoint.sh b/containers/openstack/heat-init/entrypoint.sh
@@ -1,6 +1,4 @@
-#!/bin/bash
-
-set -ex
+#!/bin/bash -ex
 
 # linux distro here always centos for now
 src_path='/usr/lib/python2.7/site-packages'

diff --git a/containers/openstack/neutron-init/Dockerfile b/containers/openstack/neutron-init/Dockerfile
@@ -4,7 +4,7 @@ FROM ${CONTRAIL_REGISTRY}/contrail-base:${CONTRAIL_CONTAINER_TAG}
 
 ARG CONTAINER_NAME
 
-RUN yum install -y neutron-plugin-contrail python-neutron-lbaas \
+RUN yum install -y neutron-plugin-contrail python-neutron-lbaas && \
     yum clean all -y && \
     rm -rf /var/cache/yum
 

diff --git a/containers/openstack/neutron-init/entrypoint.sh b/containers/openstack/neutron-init/entrypoint.sh
@@ -1,6 +1,4 @@
-#!/bin/bash
-
-set -ex
+#!/bin/bash -ex
 
 # linux distro here always centos for now
 src_path='/usr/lib/python2.7/site-packages'

diff --git a/containers/rhel-prepare-system.sh b/containers/rhel-prepare-system.sh
@@ -11,7 +11,7 @@ if ! subscription-manager status | grep -q -i 'Overall Status: Current' ; then
   [ -n "$RHEL_USER_NAME" ] && register_opts+=" --username $RHEL_USER_NAME"
   [ -n "$RHEL_USER_PASSWORD" ] && register_opts+=" --password $RHEL_USER_PASSWORD"
   [ -n "$ORG_KEY" ] && register_opts+=" --org $ORG_KEY"
-  [ -n "$RHEL_ACTIVATION_KEY" ] && activationkey+=" --org $RHEL_ACTIVATION_KEY"
+  [ -n "$RHEL_ACTIVATION_KEY" ] && register_opts+=" --activationkey $RHEL_ACTIVATION_KEY"
   echo "INFO: register system with opts $register_opts"
   subscription-manager register $register_opts
   attach_opts='--auto'