From a9f3874217ff073181006c20e6c4a8114426de37 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Andr=C3=A9?= <m.andre@redhat.com>
Date: Fri, 28 Sep 2018 08:30:45 +0200
Subject: [PATCH] Add OS::TripleO::Services::Rhsm to OpenShift roles
The OpenShift roles should include the OS::TripleO::Services::Rhsm
service for Red Hat Subscription Management so that the provisioned
nodes can register with a Satellite or CDN.
Add the Podman service to OpenShifAllInOne to be more consistent with
other roles.
Change-Id: I08862635c68eddbb0940863c43867ece1b289ee5
---
roles/OpenShiftAllInOne.yaml | 13 ++++++++-----
roles/OpenShiftInfra.yaml | 7 ++++---
roles/OpenShiftMaster.yaml | 7 ++++---
roles/OpenShiftWorker.yaml | 5 +++--
4 files changed, 19 insertions(+), 13 deletions(-)
diff --git a/roles/OpenShiftAllInOne.yaml b/roles/OpenShiftAllInOne.yaml
index 3756138a54..9e2e48c027 100644
--- a/roles/OpenShiftAllInOne.yaml
+++ b/roles/OpenShiftAllInOne.yaml
@@ -22,14 +22,17 @@
default_route_networks: ['External']
ServicesDefault:
- OS::TripleO::Services::Docker
- - OS::TripleO::Services::Sshd
- OS::TripleO::Services::Ntp
+ - OS::TripleO::Services::OpenShift::GlusterFS
+ - OS::TripleO::Services::OpenShift::Infra
+ - OS::TripleO::Services::OpenShift::Master
+ - OS::TripleO::Services::OpenShift::Worker
+ - OS::TripleO::Services::Podman
+ - OS::TripleO::Services::Rhsm
+ - OS::TripleO::Services::Sshd
- OS::TripleO::Services::TripleoFirewall
- OS::TripleO::Services::TripleoPackages
+
# NOTE(mandre) In all-in-one HAproxy conflicts with the one openshift deploys
# - OS::TripleO::Services::HAproxy
# - OS::TripleO::Services::Keepalived
- - OS::TripleO::Services::OpenShift::Master
- - OS::TripleO::Services::OpenShift::Worker
- - OS::TripleO::Services::OpenShift::Infra
- - OS::TripleO::Services::OpenShift::GlusterFS
diff --git a/roles/OpenShiftInfra.yaml b/roles/OpenShiftInfra.yaml
index f1d65685ca..a60f7f848d 100644
--- a/roles/OpenShiftInfra.yaml
+++ b/roles/OpenShiftInfra.yaml
@@ -19,8 +19,9 @@
default_route_networks: ['ControlPlane']
ServicesDefault:
- OS::TripleO::Services::Docker
- - OS::TripleO::Services::Podman
- - OS::TripleO::Services::Sshd
- OS::TripleO::Services::Ntp
- - OS::TripleO::Services::OpenShift::Infra
- OS::TripleO::Services::OpenShift::GlusterFS
+ - OS::TripleO::Services::OpenShift::Infra
+ - OS::TripleO::Services::Podman
+ - OS::TripleO::Services::Rhsm
+ - OS::TripleO::Services::Sshd
diff --git a/roles/OpenShiftMaster.yaml b/roles/OpenShiftMaster.yaml
index 1893c11dd2..25ae292bf1 100644
--- a/roles/OpenShiftMaster.yaml
+++ b/roles/OpenShiftMaster.yaml
@@ -23,11 +23,12 @@
ServicesDefault:
- OS::TripleO::Services::ContainerImagePrepare
- OS::TripleO::Services::Docker
+ - OS::TripleO::Services::HAproxy
+ - OS::TripleO::Services::Keepalived
+ - OS::TripleO::Services::OpenShift::Master
- OS::TripleO::Services::Podman
+ - OS::TripleO::Services::Rhsm
- OS::TripleO::Services::Sshd
- OS::TripleO::Services::Timesync
- OS::TripleO::Services::TripleoFirewall
- OS::TripleO::Services::TripleoPackages
- - OS::TripleO::Services::HAproxy
- - OS::TripleO::Services::Keepalived
- - OS::TripleO::Services::OpenShift::Master
diff --git a/roles/OpenShiftWorker.yaml b/roles/OpenShiftWorker.yaml
index 12b27a5a7b..01d4ca187a 100644
--- a/roles/OpenShiftWorker.yaml
+++ b/roles/OpenShiftWorker.yaml
@@ -19,8 +19,9 @@
default_route_networks: ['ControlPlane']
ServicesDefault:
- OS::TripleO::Services::Docker
+ - OS::TripleO::Services::OpenShift::GlusterFS
+ - OS::TripleO::Services::OpenShift::Worker
- OS::TripleO::Services::Podman
+ - OS::TripleO::Services::Rhsm
- OS::TripleO::Services::Sshd
- OS::TripleO::Services::Timesync
- - OS::TripleO::Services::OpenShift::Worker
- - OS::TripleO::Services::OpenShift::GlusterFS