-
Notifications
You must be signed in to change notification settings - Fork 2.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #4991 from rparulek/nuage-atomic-ansible
Nuage changes for Atomic hosts OSE Integration
- Loading branch information
Showing
11 changed files
with
450 additions
and
118 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,27 @@ | ||
--- | ||
- name: Set the Nuage plugin openshift directory fact to handle Atomic host install | ||
set_fact: | ||
nuage_node_plugin_dir: /var/usr/share/vsp-openshift | ||
when: openshift.common.is_atomic | bool | ||
|
||
- name: Set the Nuage CNI network config directory fact to handle Atomic host install | ||
set_fact: | ||
nuage_node_cni_netconf_dir: /var/etc/cni/net.d/ | ||
when: openshift.common.is_atomic | bool | ||
|
||
- name: Set the Nuage CNI binary directory fact to handle Atomic host install | ||
set_fact: | ||
nuage_node_cni_bin_dir: /var/opt/cni/bin/ | ||
when: openshift.common.is_atomic | bool | ||
|
||
- name: Assure CNI plugin config dir exists before daemon set install | ||
become: yes | ||
file: path="{{ nuage_node_plugin_dir }}" state=directory | ||
|
||
- name: Assure CNI netconf directory exists before daemon set install | ||
become: yes | ||
file: path="{{ nuage_node_cni_netconf_dir }}" state=directory | ||
|
||
- name: Assure CNI plugin binary directory exists before daemon set install | ||
become: yes | ||
file: path="{{ nuage_node_cni_bin_dir }}" state=directory |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
111 changes: 111 additions & 0 deletions
111
roles/nuage_master/templates/nuage-master-config-daemonset.j2
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,111 @@ | ||
# This ConfigMap is used to configure Nuage VSP configuration on master nodes | ||
kind: ConfigMap | ||
apiVersion: v1 | ||
metadata: | ||
name: nuage-master-config | ||
namespace: kube-system | ||
data: | ||
# This will generate the required Nuage configuration | ||
# on master nodes | ||
monitor_yaml_config: | | ||
|
||
# .kubeconfig that includes the nuage service account | ||
kubeConfig: {{ nuage_master_crt_dir }}/nuage.kubeconfig | ||
# name of the nuage service account, or another account with 'cluster-reader' | ||
# permissions | ||
# Openshift master config file | ||
masterConfig: /etc/origin/master/master-config.yaml | ||
# URL of the VSD Architect | ||
vsdApiUrl: {{ vsd_api_url }} | ||
# API version to query against. Usually "v3_2" | ||
vspVersion: {{ vsp_version }} | ||
# Name of the enterprise in which pods will reside | ||
enterpriseName: {{ enterprise }} | ||
# Name of the domain in which pods will reside | ||
domainName: {{ domain }} | ||
# VSD generated user certificate file location on master node | ||
userCertificateFile: {{ nuage_master_crt_dir }}/{{ vsd_user }}.pem | ||
# VSD generated user key file location on master node | ||
userKeyFile: {{ nuage_master_crt_dir }}/{{ vsd_user }}-Key.pem | ||
# Location where logs should be saved | ||
log_dir: /var/log/nuage-openshift-monitor | ||
# Monitor rest server parameters | ||
# Logging level for the nuage openshift monitor | ||
# allowed options are: 0 => INFO, 1 => WARNING, 2 => ERROR, 3 => FATAL | ||
logLevel: 0 | ||
# Parameters related to the nuage monitor REST server | ||
nuageMonServer: | ||
URL: 0.0.0.0:9443 | ||
certificateDirectory: {{ nuage_master_crt_dir }} | ||
# etcd config required for HA | ||
etcdClientConfig: | ||
ca: {{ nuage_master_crt_dir }}/nuageMonCA.crt | ||
certFile: {{ nuage_master_crt_dir }}/nuageMonServer.crt | ||
keyFile: {{ nuage_master_crt_dir }}/master.etcd-client.key | ||
urls: | ||
{% for etcd_url in openshift.master.etcd_urls %} | ||
- {{ etcd_url }} | ||
{% endfor %} | ||
|
||
--- | ||
|
||
# This manifest installs Nuage master node configuration on | ||
# each Nuage master node in a cluster. | ||
kind: DaemonSet | ||
apiVersion: extensions/v1beta1 | ||
metadata: | ||
name: nuage-master-config | ||
namespace: kube-system | ||
labels: | ||
k8s-app: nuage-master-config | ||
spec: | ||
selector: | ||
matchLabels: | ||
k8s-app: nuage-master-config | ||
template: | ||
metadata: | ||
labels: | ||
k8s-app: nuage-master-config | ||
spec: | ||
hostNetwork: true | ||
tolerations: | ||
- key: node-role.kubernetes.io/master | ||
effect: NoSchedule | ||
operator: Exists | ||
nodeSelector: | ||
install-monitor: "true" | ||
containers: | ||
# This container configures Nuage Master node | ||
- name: install-nuage-master-config | ||
image: nuage/master:{{ nuage_monitor_container_image_version }} | ||
ports: | ||
- containerPort: 9443 | ||
hostPort: 9443 | ||
command: ["/configure-master.sh"] | ||
args: ["ose", "{{ master_host_type }}"] | ||
securityContext: | ||
privileged: true | ||
env: | ||
# nuage-openshift-monitor.yaml config to install on each slave node. | ||
- name: NUAGE_MASTER_VSP_CONFIG | ||
valueFrom: | ||
configMapKeyRef: | ||
name: nuage-master-config | ||
key: monitor_yaml_config | ||
volumeMounts: | ||
- mountPath: /var/log | ||
name: cni-log-dir | ||
- mountPath: {{ nuage_master_config_dsets_mount_dir }} | ||
name: usr-share-dir | ||
- mountPath: /etc/origin/ | ||
name: master-config-dir | ||
volumes: | ||
- name: cni-log-dir | ||
hostPath: | ||
path: /var/log | ||
- name: usr-share-dir | ||
hostPath: | ||
path: {{ nuage_master_config_dsets_mount_dir }} | ||
- name: master-config-dir | ||
hostPath: | ||
path: /etc/origin/ |
Oops, something went wrong.