openstack/heat-templates
Code Issues Proposed changes

Fix github user content domain for openshift.sh

Browse Source 
The domains serving user content from github have changed recently:

https://developer.github.com/changes/2014-04-25-user-content-security/

This change updates the URLs that the OpenShift templates use
to download the openshift.sh from github.

Change-Id: Ifb90b0f0225b16313821a81ce54d14f551d159ed
This commit is contained in:
Pep Turro Mauri 2014-05-09 16:29:45 +02:00
parent 025e2e80b3
commit f56bca317a
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
openshift-enterprise/heat/aws/OpenShift-1B1N.yaml
View File

@ -208,7 +208,7 @@ Resources:
- '
'
- rm -f /root/openshift.sh;wget https://raw.github.com/openshift/openshift-extras/enterprise-1.2/enterprise/install-scripts/generic/openshift.sh
- rm -f /root/openshift.sh;wget https://raw.githubusercontent.com/openshift/openshift-extras/enterprise-1.2/enterprise/install-scripts/generic/openshift.sh
- '
'
@ -369,7 +369,7 @@ Resources:
- '
'
- rm -f /root/openshift.sh;wget https://raw.github.com/openshift/openshift-extras/enterprise-1.2/enterprise/install-scripts/generic/openshift.sh
- rm -f /root/openshift.sh;wget https://raw.githubusercontent.com/openshift/openshift-extras/enterprise-1.2/enterprise/install-scripts/generic/openshift.sh
- '
'

4
openshift-enterprise/heat/neutron/OpenShift-1B1N-neutron.yaml
View File

@ -236,7 +236,7 @@ resources:
VALIDATOR_ARGS="--oo-version=${CONF_OSE_VERSION} --role=broker --fix-all"
./oo-admin-yum-validator ${VALIDATOR_ARGS} || ./oo-admin-yum-validator ${VALIDATOR_ARGS}
popd
wget https://raw.github.com/openshift/openshift-extras/enterprise-${CONF_OSE_VERSION}/enterprise/install-scripts/generic/openshift.sh
wget https://raw.githubusercontent.com/openshift/openshift-extras/enterprise-${CONF_OSE_VERSION}/enterprise/install-scripts/generic/openshift.sh
chmod +x ./openshift.sh
./openshift.sh 2>&1 | tee /tmp/openshift.out
echo "${CONF_NODE_HOSTNAME%.${PREFIX}} A ${CONF_NODE_IP_ADDR}" >> /var/named/dynamic/${PREFIX}.db
@ -323,7 +323,7 @@ resources:
VALIDATOR_ARGS="--oo-version=${P_YUM_VALIDATOR_VERSION} --role=node-eap --fix-all"
./oo-admin-yum-validator ${VALIDATOR_ARGS} || ./oo-admin-yum-validator ${VALIDATOR_ARGS}
popd
wget https://raw.github.com/openshift/openshift-extras/enterprise-${CONF_OSE_VERSION}/enterprise/install-scripts/generic/openshift.sh
wget https://raw.githubusercontent.com/openshift/openshift-extras/enterprise-${CONF_OSE_VERSION}/enterprise/install-scripts/generic/openshift.sh
chmod +x ./openshift.sh
./openshift.sh 2>&1 | tee /tmp/openshift.out
setenforce 1

6
openshift-enterprise/heat/neutron/highly-available/ose_ha_stack.yaml
View File

@ -431,7 +431,7 @@ resources:
export CONF_ACTIVEMQ_ADMIN_PASSWORD=P_CONF_ACTIVEMQ_ADMIN_PASSWORD
export CONF_ACTIVEMQ_AMQ_USER_PASSWORD=P_CONF_ACTIVEMQ_AMQ_USER_PASSWORD
curl -O https://raw.github.com/openshift/openshift-extras/enterprise-P_OSE_VERSION/enterprise/install-scripts/generic/openshift.sh -k
curl -O https://raw.githubusercontent.com/openshift/openshift-extras/enterprise-P_OSE_VERSION/enterprise/install-scripts/generic/openshift.sh -k
chmod +x ./openshift.sh
./openshift.sh 2>&1 | tee /tmp/openshift.out
sed -i '/type master/a \
@ -536,7 +536,7 @@ resources:
export CONF_ACTIVEMQ_ADMIN_PASSWORD=P_CONF_ACTIVEMQ_ADMIN_PASSWORD
export CONF_ACTIVEMQ_AMQ_USER_PASSWORD=P_CONF_ACTIVEMQ_AMQ_USER_PASSWORD
curl -O https://raw.github.com/openshift/openshift-extras/enterprise-P_OSE_VERSION/enterprise/install-scripts/generic/openshift.sh -k
curl -O https://raw.githubusercontent.com/openshift/openshift-extras/enterprise-P_OSE_VERSION/enterprise/install-scripts/generic/openshift.sh -k
chmod +x ./openshift.sh
./openshift.sh 2>&1 | tee /tmp/openshift.out
setenforce 1
@ -626,7 +626,7 @@ resources:
export CONF_ACTIVEMQ_ADMIN_PASSWORD=P_CONF_ACTIVEMQ_ADMIN_PASSWORD
export CONF_ACTIVEMQ_AMQ_USER_PASSWORD=P_CONF_ACTIVEMQ_AMQ_USER_PASSWORD
curl -O https://raw.github.com/openshift/openshift-extras/enterprise-P_OSE_VERSION/enterprise/install-scripts/generic/openshift.sh -k
curl -O https://raw.githubusercontent.com/openshift/openshift-extras/enterprise-P_OSE_VERSION/enterprise/install-scripts/generic/openshift.sh -k
chmod +x ./openshift.sh
./openshift.sh 2>&1 | tee /tmp/openshift.out
setenforce 1

2
openshift-enterprise/heat/neutron/highly-available/ose_node_stack.yaml
View File

@ -287,7 +287,7 @@ resources:
export CONF_ACTIVEMQ_AMQ_USER_PASSWORD=P_CONF_ACTIVEMQ_AMQ_USER_PASSWORD
# configure OSE
curl -O https://raw.github.com/openshift/openshift-extras/enterprise-P_OSE_VERSION/enterprise/install-scripts/generic/openshift.sh -k
curl -O https://raw.githubusercontent.com/openshift/openshift-extras/enterprise-P_OSE_VERSION/enterprise/install-scripts/generic/openshift.sh -k
chmod +x ./openshift.sh
./openshift.sh 2>&1 | tee /tmp/openshift.out
setenforce 1