Merge pull request #3 from Didier-Lalli/master

Updated integration pack to support Synergy and Image Streamer
HewlettPackard · Jun 29, 2017 · 8950a7a · 8950a7a
2 parents 89d6c5e + cb3262d
commit 8950a7a
Show file tree

Hide file tree

Showing 52 changed files with 1,232 additions and 563 deletions.
diff --git a/DCOS Integration Pack Artifact Bundle.zip b/DCOS Integration Pack Artifact Bundle.zip
diff --git a/README.md b/README.md
diff --git a/config.json b/config.json
diff --git a/doc/ComposableInfrastructurePackforMesosphere.pdf b/doc/ComposableInfrastructurePackforMesosphere.pdf
diff --git a/files/ip-detect-on-HPE-CCLASS b/files/ip-detect-on-HPE-CCLASS
@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+set -o nounset -o errexit
+export PATH=/usr/sbin:/usr/bin:$PATH
+if_name=`ifconfig | grep eno | cut --delimiter=: -f 1`
+echo $(ip addr show $if_name | grep -Eo '[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}' | head -1)
diff --git a/files/ip-detect-on-HPE-SYNERGY b/files/ip-detect-on-HPE-SYNERGY
@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+set -o nounset -o errexit
+export PATH=/usr/sbin:/usr/bin:$PATH
+if_name=`ifconfig | grep ens | cut --delimiter=: -f 1`
+echo $(ip addr show $if_name | grep -Eo '[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}' | head -1)
diff --git a/group_vars/all b/group_vars/all
@@ -1,54 +1,64 @@
-###
-# Copyright (2016) Hewlett Packard Enterprise Development LP
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# You may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-###
-
----
-# Variables here are applicable to all host groups
-httpd_port: 80
-
-# DCOS Settings
-DCOS_GENERATE_CONFIG_PATH: '/root/dcos-cache/dcos_generate_config.sh'   # copied with $  curl -O https://downloads.dcos.io/dcos/stable/dcos_generate_config.sh
-DCOS_CLUSTER_NAME: 'DCOS-ONEVIEW'
-DCOS_BOOTSTRAP_URL: 'http://bootstrap.cilab.net'
-
-# ICsp Settings
-icsp: <ICSPIPADDRESS> # ICsp appliance IP Address
-icsp_username: <ICSPUSERNAME> # ICsp user name
-icsp_password: <ICSPUSERPASSWORD> # ICsp password
-osbp_custom_attributes:
-  - SSH_CERT: "{{ lookup('file', '~/.ssh/root_ansible.pub') }}"
-
-#iLO Credentials
-server_username: <ILOUSERNAME>  # iLO credentials for the target server that will be registered in ICsp
-server_password: <ILOPASSWORD> #iLO password
-
-# Network Settings
-domain_name: "cilab.net"
-dns_server: 192.168.1.1
-
-network_config:
-  hostname: "{{ inventory_hostname }}"
-  domain: "{{ domain_name }}"
-  interfaces:
-  - macAddress: "{{ server_profile.connections[0].mac }}"
-    enabled: true
-    dhcpv4: true
-    ipv6Autoconfig: 
-    vlanid: -1
-  - macAddress: "{{ server_profile.connections[1].mac }}"
-    enabled: true
-    dhcpv4: true
-    ipv6Autoconfig: false
-  virtualInterfaces:
+###
+# Copyright (2016) Hewlett Packard Enterprise Development LP
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# You may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+---
+# Variables here are applicable to all host groups
+httpd_port: 80
+
+# Network Settings
+domain_name: "mesosphere.lab"
+dns_server: 192.168.1.1
+
+# HPE Settings
+#HARDWARE_ARCHITECTURE: HPE-CCLASS
+HARDWARE_ARCHITECTURE: HPE-SYNERGY
+#HARDWARE_ARCHITECTURE: HPE-DL
+INTERFACE_NAME: ens3f4
+#INTERFACE_NAME: eno2
+
+# DCOS Settings
+DCOS_GENERATE_CONFIG_PATH: '/root/dcos-cache/dcos_generate_config.sh'   # copied with $  curl -O https://downloads.dcos.io/dcos/staible/dcos_generate_config.sh
+DCOS_CLUSTER_NAME: 'DCOS-ONEVIEW'
+DCOS_BOOTSTRAP_URL: 'http://bootstrap.{{ domain_name }}'
+config: "{{ playbook_dir }}/oneview_config.json"
+#deployment_plan_name: 'RHEL-7.3_DCOS_pramod'
+deployment_plan_name: 'RHEL-7.3-DCOS-BASE-OS'
+management_network_name: 'Mgmt A'
+server_template_name: 'DCOS Node Template'
+
+# ICsp Settings
+icsp: <ICSPIPADDRESS> # ICsp appliance IP Address
+icsp_username: <ICSPUSERNAME> # ICsp user name
+icsp_password: <ICSPUSERPASSWORD> # ICsp password
+osbp_custom_attributes:
+  - SSH_CERT: "{{ lookup('file', '~/.ssh/root_ansible.pub') }}"
+
+#iLO Credentials
+server_username: <ILOUSERNAME>  # iLO credentials for the target server that will be registered in ICsp
+server_password: <ILOPASSWORD> #iLO password
+
+network_config:
+  hostname: "{{ inventory_hostname }}"
+  domain: "{{ domain_name }}"
+  interfaces:
+  - macAddress: "{{ server_profile.connections[0].mac }}"
+    enabled: true
+    dhcpv4: true
+    ipv6Autoconfig: 
+    vlanid: -1
+  - macAddress: "{{ server_profile.connections[1].mac }}"
+    enabled: true
+    dhcpv4: true
+    ipv6Autoconfig: false
+  virtualInterfaces:
diff --git a/hosts b/hosts
@@ -1,12 +1,3 @@
-# limitations under the License.
-###
-
-# default user and password generated on ICsp provisioning
-# If you set the SSH key during the server provisioning, you don't need to
-# specify the credentials
-
-# If you wish, you can specify manually the IP addres that ICsp will set
-# to the provisioned server ethernet adapter
 
 # There is only one bootstrap node
 [dcos-bootstrap]
@@ -37,7 +28,7 @@ node_type=slave_public
 [dcos-private-agents]
 agent2
 agent3
-agent4
+#agent4
 
 [dcos-private-agents:vars]
 node_type=slave
@@ -50,3 +41,4 @@ dcos-agents
 
 # Removed nodes
 [dcos-evicted-agents]
+#agent3
diff --git a/media/image1.png b/media/image1.png
diff --git a/media/image10.png b/media/image10.png
diff --git a/media/image11.png b/media/image11.png
diff --git a/media/image12.png b/media/image12.png
diff --git a/media/image13.png b/media/image13.png
diff --git a/media/image14.png b/media/image14.png
diff --git a/media/image15.png b/media/image15.png
diff --git a/media/image16.png b/media/image16.png
diff --git a/media/image17.png b/media/image17.png
diff --git a/media/image18.png b/media/image18.png
diff --git a/media/image19.png b/media/image19.png
diff --git a/media/image2.png b/media/image2.png
diff --git a/media/image20.png b/media/image20.png
diff --git a/media/image21.png b/media/image21.png
diff --git a/media/image22.png b/media/image22.png
diff --git a/media/image23.png b/media/image23.png
diff --git a/media/image24.png b/media/image24.png
diff --git a/media/image3.png b/media/image3.png
diff --git a/media/image4.png b/media/image4.png
diff --git a/media/image5.png b/media/image5.png
diff --git a/media/image6.png b/media/image6.png
diff --git a/media/image7.png b/media/image7.png
diff --git a/media/image8.png b/media/image8.png
diff --git a/media/image9.png b/media/image9.png
diff --git a/oneview_config.json b/oneview_config.json
diff --git a/ov_dcos.yml b/ov_dcos.yml
@@ -1,54 +1,69 @@
-###
-# Copyright (2017) Hewlett Packard Enterprise Development LP
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# You may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-###
-
----
-# This playbook deploys a complete DC-OS Cluster according to hosts definition
-
-- name: Install all Physical Nodes
-  hosts: all-nodes
-  vars: 
-    ov_osbp: "{{ os_build_plan }}"
-    ov_profile: "{{ ov_template }}" 
-  gather_facts: no
-  roles:
-    - hpe-oneview-server
-
-- name: All nodes are DC/OS Nodes
-  hosts: all-nodes 
-  gather_facts: yes
-  roles:
-    - dcos-node
-
-- name: Collect configuration of nodes
-  hosts: all-nodes 
-  gather_facts: yes
-  tasks:
-  - name: Link Certificate Authorities
-    # required on CentOS because DC/OS compilation is done on Ubuntu
-    file: src=/etc/ssl/certs/ca-bundle.crt dest=/etc/ssl/certs/ca-certificates.crt state=link
-  - include: tasks/detect-public-ip.yml
-
-- name: Generate DC/OS Bootstrap
-  hosts: dcos-bootstrap
-  gather_facts: no
-  tasks:
-  - include: tasks/bootstrap.yml
-
-- name: Install DC/OS Masters and Agents
-  hosts: dcos-masters,dcos-agents
-  gather_facts: no
-  tasks:
-  - include: tasks/install.yml
+###
+# Copyright (2017) Hewlett Packard Enterprise Development LP
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# You may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+###
+
+---
+# This playbook deploys a complete DC-OS Cluster according to hosts definition
+
+- name: Install all Physical Nodes
+  hosts: all-nodes
+  vars: 
+    ov_osbp: "{{ os_build_plan }}"
+    ov_profile: "{{ ov_template }}" 
+  gather_facts: no
+  roles:
+    - hpe-oneview-server
+
+#- name: Add proxy to the nodes
+#  hosts: all-nodes 
+#  gather_facts: yes
+#  tasks:
+   # - name: insert Proxy details for all users 
+      #blockinfile:
+      #  dest: /etc/profile.d/proxy.sh
+      #  create: true
+      #  block: |
+      #    export http_proxy=http://proxy.houston.hpecorp.net:8088
+      #    export https_proxy=http://proxy.houston.hpecorp.net:8088 
+   # - name: delete rogue default route
+   #   command:  ip route del default via 192.168.8.1
+
+- name: All nodes are DC/OS Nodes
+  hosts: all-nodes 
+  gather_facts: yes
+  roles:
+    - dcos-node
+
+- name: Collect configuration of nodes
+  hosts: all-nodes 
+  gather_facts: yes
+  tasks:
+  - name: Link Certificate Authorities
+    # required on CentOS because DC/OS compilation is done on Ubuntu
+    file: src=/etc/ssl/certs/ca-bundle.crt dest=/etc/ssl/certs/ca-certificates.crt state=link
+  - include: tasks/detect-public-ip.yml
+
+- name: Generate DC/OS Bootstrap
+  hosts: dcos-bootstrap
+  gather_facts: no
+  tasks:
+  - include: tasks/bootstrap.yml
+
+- name: Install DC/OS Masters and Agents
+  hosts: dcos-masters,dcos-agents
+  gather_facts: no
+  tasks:
+  - include: tasks/install.yml
+
diff --git a/ov_dcos_clean_agent.yml b/ov_dcos_clean_agent.yml
@@ -32,7 +32,7 @@
     - name: Delete server profile from HPE OneView
       connection: local
       oneview_server_profile:
-        config: "{{ playbook_dir }}/config.json"
+        config: "{{ playbook_dir }}/oneview_config.json"
         state: absent        
         data:
           name: "{{ inventory_hostname }}"

diff --git a/ov_dcos_decompose_all.yml b/ov_dcos_decompose_all.yml
@@ -25,7 +25,7 @@
     - name: Delete server profile from HPE OneView
       connection: local
       oneview_server_profile:
-        config: "{{ playbook_dir }}/config.json"
+        config: "{{ playbook_dir }}/oneview_config.json"
         state: absent        
         data:
           name: "{{ inventory_hostname }}"

diff --git a/roles/dcos-node/tasks/dcos-deps.yml b/roles/dcos-node/tasks/dcos-deps.yml
@@ -32,6 +32,9 @@
    - ipset
    - ntp
    - ntpdate
+   - rsync
+   - net-tools
+   - bind-utils
 
 # Firewall should be configured if cluster is publicly accessible.
 # For local dev/test/demo, just disable it.