Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Cleaning up issues with configuration for rhc success

  • Loading branch information...
commit 0c00b8cf11e0357c3578ef7efd70a7342960177b 1 parent ce91960
@vindir vindir authored root committed
View
55 README.md
@@ -26,3 +26,58 @@ class { "openshift::node":
domain => "example.com",
}
```
+
+Developer Workstation
+=====================
+
+Create a User Account
+---------------------
+User accounts are managed via htpasswd authentication on the broker machine.
+Updating the htpasswd setup for openshift is done by running the htpasswd
+command.
+
+```htpasswd /etc/openshift/htpasswd username on the broker.```
+
+Install the RHC Client
+----------------------
+
+Instructions on installing rhc for various platforms is available at
+ https://openshift.redhat.com/community/developers/install-the-client-tools
+
+In order to use the rhc client with a local openshift installation, it is
+necessary to update the LIBRA_SERVER environment variable.
+
+```
+export LIBRA_SERVER=broker.example.com
+```
+
+Client Tools
+============
+
+If you are running RHEL/CentOS, the client tools can be installed and
+used for diagnostics against the openshift setup. The configuration steps for
+the repo are available below. These are installed by default on the broker
+and node machines by the openshift module.
+
+1. Create the following file:
+
+```
+/etc/yum.repos.d/openshift-client.repo
+```
+
+2. Add the following content:
+
+```
+[openshift_client]
+name=OpenShift Client
+baseurl=https://mirror.openshift.com/pub/origin-server/nightly/enterprise/2012-11-15/Client/x86_64/os/
+enabled=1
+gpgcheck=0
+```
+
+3. Save and close the file.
+
+................................................................................
+
+
+
View
30 manifests/broker.pp
@@ -118,7 +118,7 @@
}
lokkit::ports { 'openshift' :
- tcpPorts => [ '61613' ],
+ tcpPorts => [ '61613', '8161' ],
}
selinux::boolean { [httpd_unified, httpd_can_network_connect, httpd_can_network_relay, httpd_run_stickshift, named_write_master_zones, allow_ypbind]:
@@ -162,18 +162,18 @@
owner => root, group => root, mode => 0444,
}
- exec { "update zone data":
- command => "/usr/bin/nsupdate -v -k ${keyfile} <<EOF
-server 127.0.0.1
-update delete ${fqdn} A
-update add ${fqdn} 180 A ${ipaddress}
-show
-send
-quit
-EOF",
- unless => "/usr/bin/[ ! -f /var/named/K${domain}*.private ]",
- require => Service["named"],
- }
+# exec { "update zone data":
+# command => "/usr/bin/nsupdate -v -k ${keyfile} <<EOF
+#server 127.0.0.1
+#update delete ${fqdn} A
+#update add ${fqdn} 180 A ${ipaddress}
+#show
+#send
+#quit
+#EOF",
+# unless => "/usr/bin/[ ! -f /var/named/K${domain}*.private ]",
+# require => Service["named"],
+# }
file { "resolv config":
path => "/etc/resolv.conf",
@@ -270,8 +270,8 @@
require => Package["rubygem-openshift-origin-msg-broker-mcollective"]
}
- file { "plugin openshift-origin-dns-bind.conf.erb":
- path => "/etc/openshift/plugins.d/openshift-origin-dns-bind.conf.erb",
+ file { "plugin openshift-origin-dns-bind.conf":
+ path => "/etc/openshift/plugins.d/openshift-origin-dns-bind.conf",
content => template("openshift/openshift-origin-dns-bind.conf.erb"),
owner => root, group => root, mode => 0644,
require => Package["rubygem-openshift-origin-dns-bind"]
View
1  templates/named.conf.erb
@@ -8,7 +8,6 @@
options {
listen-on port 53 { any; };
- listen-on port 953 { any; };
directory "/var/named";
dump-file "/var/named/data/cache_dump.db";
statistics-file "/var/named/data/named_stats.txt";
View
14 templates/openshift-origin-broker_proxy.conf.erb
@@ -54,19 +54,5 @@
ProxyPassReverse /broker http://127.0.0.1:8080/broker
</VirtualHost>
-<VirtualHost *:443>
- ServerAdmin root@localhost
- DocumentRoot /var/www/html
- SSLEngine on
- SSLProxyEngine on
- SSLCertificateFile /etc/pki/tls/certs/localhost.crt
- SSLCertificateKeyFile /etc/pki/tls/private/localhost.key
- RequestHeader set X_FORWARDED_PROTO 'https'
- RequestHeader set Front-End-Https "On"
- ProxyTimeout 300
- ProxyPass /broker http://127.0.0.1:8080/broker
- ProxyPassReverse /broker http://127.0.0.1:8080/broker
-</VirtualHost>
-
ProxyPreserveHost On
RequestHeader unset X-Forwarded-For
Please sign in to comment.
Something went wrong with that request. Please try again.