Merge "Add CentOS NetworkManager testing node"

2019-01-11 00:54:47 +00:00 · 2019-01-11 00:54:47 +00:00 · 1ba2bc4df2
commit 1ba2bc4df2
parent 5c4b26425f 32e63aa0c8
5 changed files with 77 additions and 0 deletions
--- a/nodepool/nl01.openstack.org.yaml
+++ b/nodepool/nl01.openstack.org.yaml
@ -15,6 +15,8 @@ zookeeper-servers:
 labels:
  - name: centos-7
    min-ready: 1
+  - name: centos-7-nm
+    min-ready: 1
  - name: debian-stretch
    min-ready: 1
  - name: fedora-28
@ -46,6 +48,8 @@ providers:
    diskimages: &provider_diskimages
      - name: centos-7
        config-drive: true
+      - name: centos-7-nm
+        config-drive: true
      - name: debian-stretch
        config-drive: true
      - name: fedora-28
@ -75,6 +79,11 @@ providers:
            flavor-name: 'Performance'
            diskimage: centos-7
            key-name: infra-root-keys-2018-06-15
+          - name: centos-7-nm
+            min-ram: 8192
+            flavor-name: 'Performance'
+            diskimage: centos-7-nm
+            key-name: infra-root-keys-2018-06-15
          - name: debian-stretch
            min-ram: 8000
            flavor-name: 'Performance'
@ -153,6 +162,7 @@ providers:

 diskimages:
  - name: centos-7
+  - name: centos-7-nm
  - name: debian-stretch
  - name: fedora-28
  - name: fedora-29
--- a/nodepool/nl02.openstack.org.yaml
+++ b/nodepool/nl02.openstack.org.yaml
@ -14,6 +14,7 @@ zookeeper-servers:
 # another launcher will need to assume this logic.
 labels:
  - name: centos-7
+  - name: centos-7-nm
  - name: debian-stretch
  - name: fedora-28
  - name: fedora-29
@ -36,6 +37,8 @@ providers:
    diskimages: &provider_diskimages
      - name: centos-7
        config-drive: true
+      - name: centos-7-nm
+        config-drive: true
      - name: debian-stretch
        config-drive: true
      - name: fedora-28
@ -69,6 +72,11 @@ providers:
            flavor-name: '8C-8GB-100GB'
            diskimage: centos-7
            key-name: infra-root-keys-2018-06-15
+          - name: centos-7-nm
+            min-ram: 8000
+            flavor-name: '8C-8GB-100GB'
+            diskimage: centos-7-nm
+            key-name: infra-root-keys-2018-06-15
          - name: debian-stretch
            min-ram: 8000
            flavor-name: '8C-8GB-100GB'
@ -187,6 +195,11 @@ providers:
            flavor-name: 'nodepool.0'
            diskimage: centos-7
            key-name: infra-root-keys-2018-06-15
+          - name: centos-7-nm
+            min-ram: 8000
+            flavor-name: 'nodepool.0'
+            diskimage: centos-7-nm
+            key-name: infra-root-keys-2018-06-15
          - name: debian-stretch
            min-ram: 8000
            flavor-name: 'nodepool.0'
@ -255,6 +268,11 @@ providers:
            flavor-name: 'zuul-flavor'
            diskimage: centos-7
            key-name: infra-root-keys-2018-06-15
+          - name: centos-7-nm
+            min-ram: 8000
+            flavor-name: 'zuul-flavor'
+            diskimage: centos-7-nm
+            key-name: infra-root-keys-2018-06-15
          - name: debian-stretch
            min-ram: 8000
            flavor-name: 'zuul-flavor'
@ -308,6 +326,7 @@ providers:

 diskimages:
  - name: centos-7
+  - name: centos-7-nm
  - name: debian-stretch
  - name: fedora-28
  - name: fedora-29
--- a/nodepool/nl03.openstack.org.yaml
+++ b/nodepool/nl03.openstack.org.yaml
@ -17,6 +17,7 @@ zookeeper-servers:
 # ubuntu-xenial-arm64 being one of them.
 labels:
  - name: centos-7
+  - name: centos-7-nm
  - name: debian-stretch
  - name: debian-stretch-arm64
    min-ready: 1
@ -153,6 +154,11 @@ providers:
            flavor-name: 'osf-highcpu-8'
            diskimage: centos-7
            key-name: infra-root-keys-2018-06-15
+          - name: centos-7-nm
+            min-ram: 8000
+            flavor-name: 'osf-highcpu-8'
+            diskimage: centos-7-nm
+            key-name: infra-root-keys-2018-06-15
          - name: debian-stretch
            min-ram: 8000
            flavor-name: 'osf-highcpu-8'
@ -239,6 +245,13 @@ providers:
            volume-size: 80
            diskimage: centos-7
            key-name: infra-root-keys-2018-06-15
+          - name: centos-7-nm
+            min-ram: 8000
+            flavor-name: v2-highcpu-8
+            boot-from-volume: true
+            volume-size: 80
+            diskimage: centos-7-nm
+            key-name: infra-root-keys-2018-06-15
          - name: debian-stretch
            min-ram: 8000
            flavor-name: v2-highcpu-8
@ -442,6 +455,7 @@ providers:

 diskimages:
  - name: centos-7
+  - name: centos-7-nm
  - name: debian-stretch
  - name: debian-stretch-arm64
  - name: fedora-28
--- a/nodepool/nl04.openstack.org.yaml
+++ b/nodepool/nl04.openstack.org.yaml
@ -14,6 +14,7 @@ zookeeper-servers:
 # another launcher will need to assume this logic.
 labels:
  - name: centos-7
+  - name: centos-7-nm
  - name: debian-stretch
  - name: fedora-28
  - name: fedora-29
@ -35,6 +36,8 @@ providers:
    diskimages: &provider_diskimages
      - name: centos-7
        config-drive: true
+      - name: centos-7-nm
+        config-drive: true
      - name: debian-stretch
        config-drive: true
      - name: fedora-28
@ -66,6 +69,13 @@ providers:
            key-name: infra-root-keys-2018-06-15
            instance-properties:
              glean_ignore_interfaces: 'True'
+          - name: centos-7-nm
+            min-ram: 8000
+            flavor-name: ssd-osFoundation-3
+            diskimage: centos-7-nm
+            key-name: infra-root-keys-2018-06-15
+            instance-properties:
+              glean_ignore_interfaces: 'True'
          - name: debian-stretch
            min-ram: 8000
            flavor-name: ssd-osFoundation-3
@ -151,6 +161,7 @@ providers:

 diskimages:
  - name: centos-7
+  - name: centos-7-nm
  - name: debian-stretch
  - name: fedora-28
  - name: fedora-29
--- a/nodepool/nodepool.yaml
+++ b/nodepool/nodepool.yaml
@ -140,6 +140,29 @@ diskimages:
      DIB_EPEL_DISABLED: '1'
      GIT_HTTP_LOW_SPEED_TIME: '300'
      GIT_HTTP_LOW_SPEED_LIMIT: '1000'
+  # Temporary node to test NetworkManager based boots
+  - name: centos-7-nm
+    pause: false
+    elements:
+      - centos-minimal
+      - vm
+      - simple-init
+      - openstack-repos
+      - nodepool-base
+      - cache-devstack
+      - growroot
+      - infra-package-needs
+      - epel
+    env-vars:
+      TMPDIR: /opt/dib_tmp
+      DIB_CHECKSUM: '1'
+      DIB_IMAGE_CACHE: /opt/dib_cache
+      QEMU_IMG_OPTIONS: compat=0.10
+      DIB_GRUB_TIMEOUT: '0'
+      DIB_EPEL_DISABLED: '1'
+      GIT_HTTP_LOW_SPEED_TIME: '300'
+      GIT_HTTP_LOW_SPEED_LIMIT: '1000'
+      DIB_SIMPLE_INIT_NETWORKMANAGER: '1'
  - name: debian-stretch
    pause: false
    elements: