diff options
| author | Scott Dodson <sdodson@redhat.com> | 2017-06-16 14:34:01 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-16 14:34:01 -0400 |
| commit | b3772d718802191276e3a6278cc5628df5056399 (patch) | |
| tree | 8140242785de97a8b90e5377c544397af19aae6e | |
| parent | 1f36c9f6cbd9bc44e16ab2e0eb13aa95761c2e11 (diff) | |
| parent | f6127f924597c9fcc7da6435e14524253db64d64 (diff) | |
| download | openshift-b3772d718802191276e3a6278cc5628df5056399.tar.gz openshift-b3772d718802191276e3a6278cc5628df5056399.tar.bz2 openshift-b3772d718802191276e3a6278cc5628df5056399.tar.xz openshift-b3772d718802191276e3a6278cc5628df5056399.zip | |
Merge pull request #4474 from rhcarvalho/rename-cockpit-shell
Rename cockpit-shell -> cockpit-system
| -rwxr-xr-x | .papr.sh | 4 | ||||
| -rw-r--r-- | playbooks/adhoc/uninstall.yml | 4 | ||||
| -rw-r--r-- | roles/cockpit/tasks/main.yml | 2 | ||||
| -rw-r--r-- | roles/openshift_health_checker/openshift_checks/package_availability.py | 2 |
4 files changed, 7 insertions, 5 deletions
@@ -18,7 +18,9 @@ upload_journals() { trap upload_journals ERR # run the actual installer -ansible-playbook -vvv -i .papr.inventory playbooks/byo/config.yml +# FIXME: override openshift_image_tag defined in the inventory until +# https://github.com/openshift/openshift-ansible/issues/4478 is fixed. +ansible-playbook -vvv -i .papr.inventory playbooks/byo/config.yml -e "openshift_image_tag=$OPENSHIFT_IMAGE_TAG" # run a small subset of origin conformance tests to sanity # check the cluster NB: we run it on the master since we may diff --git a/playbooks/adhoc/uninstall.yml b/playbooks/adhoc/uninstall.yml index 97d835eae..27c3a9edd 100644 --- a/playbooks/adhoc/uninstall.yml +++ b/playbooks/adhoc/uninstall.yml @@ -103,7 +103,7 @@ - atomic-openshift-sdn-ovs - cockpit-bridge - cockpit-docker - - cockpit-shell + - cockpit-system - cockpit-ws - kubernetes-client - openshift @@ -346,7 +346,7 @@ - atomic-openshift-master - cockpit-bridge - cockpit-docker - - cockpit-shell + - cockpit-system - cockpit-ws - corosync - kubernetes-client diff --git a/roles/cockpit/tasks/main.yml b/roles/cockpit/tasks/main.yml index bddad778f..57f49ea11 100644 --- a/roles/cockpit/tasks/main.yml +++ b/roles/cockpit/tasks/main.yml @@ -3,7 +3,7 @@ package: name={{ item }} state=present with_items: - cockpit-ws - - cockpit-shell + - cockpit-system - cockpit-bridge - cockpit-docker - "{{ cockpit_plugins }}" diff --git a/roles/openshift_health_checker/openshift_checks/package_availability.py b/roles/openshift_health_checker/openshift_checks/package_availability.py index e87567fe6..0dd2b1286 100644 --- a/roles/openshift_health_checker/openshift_checks/package_availability.py +++ b/roles/openshift_health_checker/openshift_checks/package_availability.py @@ -36,7 +36,7 @@ class PackageAvailability(NotContainerizedMixin, OpenShiftCheck): "bash-completion", "cockpit-bridge", "cockpit-docker", - "cockpit-shell", + "cockpit-system", "cockpit-ws", "etcd", "httpd-tools", |