diff --git a/install/install.conf b/install/install.conf index 5734e225..7903b8c5 100755 --- a/install/install.conf +++ b/install/install.conf @@ -7,6 +7,10 @@ export OS_INSTALLER=${OS_INSTALLER:-cobbler} # PACKAGE_INSTALLER indicates the tool for Package provisioning, default is 'chef'. export PACKAGE_INSTALLER=${PACKAGE_INSTALLER:-package} +# set remi release url +# export ATOMIC=${ATOMIC:-http://www6.atomicorp.com/channels/atomic/${IMAGE_TYPE,,}/${IMAGE_VERSION_MAJOR}/${IMAGE_ARCH}/RPMS/atomic-release-1.0-19.${IMAGE_TYPE_OTHER}${IMAGE_VERSION_MAJOR}.art.noarch.rpm} +export REMI=${REMI:-http://rpms.famillecollet.com/enterprise/remi-release-6.rpm} + # service NIC export NIC=${NIC:-} export IPADDR=${IPADDR:-} diff --git a/install/install.conf.template b/install/install.conf.template index 9344c0dd..e32d913c 100755 --- a/install/install.conf.template +++ b/install/install.conf.template @@ -10,6 +10,10 @@ export OS_INSTALLER=cobbler # PACKAGE_INSTALLER indicates the tool for Package provisioning, default is 'chef'. export PACKAGE_INSTALLER=chef +# set remi release +# export ATOMIC=https://s3-us-west-1.amazonaws.com/compass-local-repo/atomic-release-1.0-19.el6.art.noarch.rpm +export REMI=http://rpms.famillecollet.com/enterprise/remi-release-6.rpm + # service NIC (A bridge "installation" is used for jenkins CI) export NIC=installation diff --git a/install/install.sh b/install/install.sh index 3bd09fa1..af95f7ef 100755 --- a/install/install.sh +++ b/install/install.sh @@ -82,21 +82,26 @@ fi sed -i 's/^mirrorlist=https/mirrorlist=http/g' /etc/yum.repos.d/epel.repo -### Add atomic repo sudo rpm -q atomic-release +if [ "$?" == "0" ]; then + sudo rpm -e atomic-release +fi + +### Add remi repo +sudo rpm -q remi-release if [ "$?" != "0" ]; then - sudo rpm -Uvh http://www6.atomicorp.com/channels/atomic/${IMAGE_TYPE,,}/${IMAGE_VERSION_MAJOR}/${IMAGE_ARCH}/RPMS/atomic-release-1.0-19.${IMAGE_TYPE_OTHER}${IMAGE_VERSION_MAJOR}.art.noarch.rpm >& /dev/null + sudo rpm -Uvh $REMI >& /dev/null if [ "$?" != "0" ]; then - echo "failed to install atomic-release" + echo "failed to install remi-release" exit 1 else - echo "successfully installed atomic-release" + echo "successfully installed remi-release" fi else - echo "atomic-release is already installed" + echo "remi-release is already installed" fi -sed -i 's/^mirrorlist=https/mirrorlist=http/g' /etc/yum.repos.d/atomic.repo +# sed -i 's/^mirrorlist=https/mirrorlist=http/g' /etc/yum.repos.d/atomic.repo ### Trap any error code with related filename and line. errtrap()