vagrant-openshift 1.0.16 → 1.0.17
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 9073818422c2a2480096ac64ea8bf3238b6d76b6
|
|
4
|
+
data.tar.gz: 78bd0ccc260b6b0e65ff9f422847385af5f62fbb
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 8a5a1f99318a659084021fe79fe226f5f677556655e94deffe4f45f37e3e95a06e9718f817f7fcb92284ef35449d280ac06ae0cd8d7edb639a2228ff8156acc5
|
|
7
|
+
data.tar.gz: 24823bf9a2edc50d3fd53816f3f0c2a36d3ad97f24f86aa5ef5c688d8fd5cbb2e18a486182ac0a12c431dea68f00fde08b3cae63ba8f94a649de0cbe9132cf92
|
|
@@ -34,10 +34,6 @@ set -e
|
|
|
34
34
|
hack/verify-gofmt.sh
|
|
35
35
|
hack/build-release.sh
|
|
36
36
|
hack/build-images.sh
|
|
37
|
-
if [ ! -d _output/etcd ]
|
|
38
|
-
then
|
|
39
|
-
hack/install-etcd.sh
|
|
40
|
-
fi
|
|
41
37
|
}
|
|
42
38
|
else
|
|
43
39
|
cmd = %{
|
|
@@ -45,12 +41,15 @@ echo "Performing openshift build..."
|
|
|
45
41
|
set -e
|
|
46
42
|
hack/verify-gofmt.sh
|
|
47
43
|
hack/build-go.sh
|
|
44
|
+
}
|
|
45
|
+
end
|
|
46
|
+
cmd += %{
|
|
47
|
+
|
|
48
48
|
if [ ! -d _output/etcd ]
|
|
49
49
|
then
|
|
50
50
|
hack/install-etcd.sh
|
|
51
51
|
fi
|
|
52
52
|
}
|
|
53
|
-
end
|
|
54
53
|
if @options[:force]
|
|
55
54
|
build_cmd = cmd
|
|
56
55
|
cmd = %{
|
|
@@ -41,7 +41,8 @@ ORIGIN_PATH=/data/src/github.com/openshift/origin
|
|
|
41
41
|
cat > /etc/profile.d/openshift.sh <<DELIM
|
|
42
42
|
export GOPATH=/data
|
|
43
43
|
export PATH=$ORIGIN_PATH/_output/etcd/bin:$ORIGIN_PATH/_output/local/go/bin/:$GOPATH/bin:$PATH
|
|
44
|
-
export KUBERNETES_MASTER=http://localhost:8080
|
|
44
|
+
#export KUBERNETES_MASTER=http://localhost:8080
|
|
45
|
+
export KUBECONFIG=/openshift.local.certificates/admin/.kubeconfig
|
|
45
46
|
DELIM
|
|
46
47
|
|
|
47
48
|
source /etc/profile.d/openshift.sh
|
|
@@ -58,11 +59,7 @@ then
|
|
|
58
59
|
HOST=\\`ip -f inet addr show | grep -Po 'inet \\K[\\d.]+' | grep 10.245 | head -1\\`
|
|
59
60
|
if [ -z "\\$HOST" ]
|
|
60
61
|
then
|
|
61
|
-
HOST
|
|
62
|
-
if [ -z "\\$HOST" ]
|
|
63
|
-
then
|
|
64
|
-
HOST=localhost
|
|
65
|
-
fi
|
|
62
|
+
HOST=localhost
|
|
66
63
|
fi
|
|
67
64
|
fi
|
|
68
65
|
|
|
@@ -79,6 +76,8 @@ Documentation=https://github.com/openshift/origin
|
|
|
79
76
|
Type=simple
|
|
80
77
|
EnvironmentFile=-/etc/profile.d/openshift.sh
|
|
81
78
|
ExecStart=$ORIGIN_PATH/_output/local/go/bin/openshift start --public-master=https://\\${HOST}:8443
|
|
79
|
+
ExecStartPost=/bin/sleep 8
|
|
80
|
+
ExecStartPost=/bin/chmod a+r -R /openshift.local.certificates/admin
|
|
82
81
|
|
|
83
82
|
[Install]
|
|
84
83
|
WantedBy=multi-user.target
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: vagrant-openshift
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 1.0.
|
|
4
|
+
version: 1.0.17
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Red Hat
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2015-02-
|
|
11
|
+
date: 2015-02-10 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: rake
|