diff options
| author | Brenton Leanhardt <bleanhar@redhat.com> | 2015-06-29 09:04:48 -0400 |
|---|---|---|
| committer | Brenton Leanhardt <bleanhar@redhat.com> | 2015-06-29 09:04:48 -0400 |
| commit | 72419411023735c7a5159d409c90d852d614bda8 (patch) | |
| tree | f1eef7bb3e693bf66f51231ae54ef6c8c4ffd01f | |
| parent | 0bd9aa5e06febf45030743d7322e66c850d0b290 (diff) | |
| parent | c6c6a0d2b609bbe55259fbc6a6c451be63e52b4c (diff) | |
| download | openshift-72419411023735c7a5159d409c90d852d614bda8.tar.gz openshift-72419411023735c7a5159d409c90d852d614bda8.tar.bz2 openshift-72419411023735c7a5159d409c90d852d614bda8.tar.xz openshift-72419411023735c7a5159d409c90d852d614bda8.zip | |
Merge pull request #292 from sdodson/oadm-switcheroo
Switch openshift ex router/registry to oadm
| -rw-r--r-- | README_OSE.md | 4 | ||||
| -rw-r--r-- | README_origin.md | 4 | ||||
| -rwxr-xr-x | roles/openshift_facts/library/openshift_facts.py | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/README_OSE.md b/README_OSE.md index 5a691053c..471fdcf9e 100644 --- a/README_OSE.md +++ b/README_OSE.md @@ -119,7 +119,7 @@ inventory file use the -i option for ansible-playbook. #### Create the default router On the master host: ```sh -openshift ex router --create=true \ +oadm router --create=true \ --credentials=/etc/openshift/master/openshift-router.kubeconfig \ --images='docker-buildvm-rhose.usersys.redhat.com:5000/openshift3/ose-${component}:${version}' ``` @@ -127,7 +127,7 @@ openshift ex router --create=true \ #### Create the default docker-registry On the master host: ```sh -openshift ex registry --create=true \ +oadm registry --create=true \ --credentials=/etc/openshift/master/openshift-registry.kubeconfig \ --images='docker-buildvm-rhose.usersys.redhat.com:5000/openshift3/ose-${component}:${version}' \ --mount-host=/var/lib/openshift/docker-registry diff --git a/README_origin.md b/README_origin.md index 32287d65c..2ccedf4d5 100644 --- a/README_origin.md +++ b/README_origin.md @@ -91,14 +91,14 @@ inventory file use the -i option for ansible-playbook. #### Create the default router On the master host: ```sh -openshift ex router --create=true \ +oadm router --create=true \ --credentials=/etc/openshift/master/openshift-router.kubeconfig ``` #### Create the default docker-registry On the master host: ```sh -openshift ex registry --create=true \ +oadm registry --create=true \ --credentials=/etc/openshift/master/openshift-registry.kubeconfig \ --mount-host=/var/lib/openshift/docker-registry ``` diff --git a/roles/openshift_facts/library/openshift_facts.py b/roles/openshift_facts/library/openshift_facts.py index 1b789ca89..ca5ea1da0 100755 --- a/roles/openshift_facts/library/openshift_facts.py +++ b/roles/openshift_facts/library/openshift_facts.py @@ -487,7 +487,7 @@ def get_current_config(facts): current_config['kubeconfig'] = config # override pylint broad-except warning, since we do not want - # to bubble up any exceptions if openshift ex config view + # to bubble up any exceptions if oc config view # fails # pylint: disable=broad-except except Exception: |