Fast forward upgrade support

installer/step1-provision-undercloud-server.yaml

@@ -1,12 +1,18 @@
 ---
 - hosts: director
+  gather_facts: false
   tasks:
-    - ping:
-      register: connect_test
+    - name: Check connection to director
+      wait_for_connection:
+        timeout: 10
       ignore_errors: true
+      register: connect_test
 
     - name: Pre-reinstall cleanup tasks
       block:
+        - name: Gather Facts
+          setup:
+
         - name: Unregister system from RH if its online still
           redhat_subscription:
             state: absent
@@ -31,6 +37,7 @@
       when: connect_test is not failed
 
 - hosts: director
+  gather_facts: false
   tasks:
     - name: Trigger cobbler to reinstall the server
       shell: >

installer/step2-install-undercloud.yaml

@@ -49,4 +49,5 @@
   vars:
     ansible_user: stack
   tasks:
-  - include_tasks: "step2-install-undercloud/{{ dci_topic | lower }}/tasks.yaml"
+    - name: Include tasks for OSP version
+      include_tasks: "step2-install-undercloud/{{ dci_topic | lower }}/tasks.yaml"

installer/step2-install-undercloud/osp10/tasks.yaml

@@ -104,7 +104,7 @@
     path: /home/stack/undercloud.conf
     section: DEFAULT
     option: local_interface
-    value: pxe-int
+    value: "{{ undercloud_local_interface }}"
 
 - name: Set local_ip in undercloud.conf
   ini_file:
@@ -148,7 +148,6 @@
     option: dhcp_end
     value: "{{ undercloud_local_ip | ipaddr('network/prefix') | ipaddr('99') | ipaddr('address') }}"
 
-
 - name: Set inspection ip range in undercloud.conf
   ini_file:
     path: /home/stack/undercloud.conf
@@ -164,6 +163,63 @@
     option: undercloud_admin_password
     value: password
 
+# Based on https://github.com/openstack/instack-undercloud/blob/newton-eol/templates/net-config.json.template
+# adds Cisco environment specific interfaces that need configuring
+- name: Write out the undercloud net config override
+  copy:
+    dest: /home/stack/undercloud_net_config.json.template
+    content: |
+      {% raw -%}
+      "network_config": [
+         {
+          "type": "ovs_bridge",
+          "name": "br-ctlplane",
+          "ovs_extra": [
+           "br-set-external-id br-ctlplane bridge-id br-ctlplane"
+          ],
+          "members": [
+           {
+            "type": "interface",
+            "name": "{{LOCAL_INTERFACE}}",
+            "primary": "true",
+            "mtu": {{LOCAL_MTU}}
+           }
+          ],
+          "addresses": [
+            {
+              "ip_netmask": "{{PUBLIC_INTERFACE_IP}}"
+            }
+          ],
+          "mtu": {{LOCAL_MTU}}
+        },
+      {% endraw %}
+        {
+          "type": "interface",
+          "name": "{{ undercloud_overcloud_interface }}",
+          "addresses": [
+            {
+              "ip_netmask": "{{ overcloud_director_ip }}"
+            }
+          ]
+        },
+        {
+          "type": "interface",
+          "name": "{{ undercloud_fake_gw_interface }}",
+          "addresses": [
+            {
+              "ip_netmask": "{{ undercloud_fake_gw_cidr }}"
+            }
+          ]
+        }
+      ]
+
+- name: Set net config override in undercloud config
+  ini_file:
+    path: /home/stack/undercloud.conf
+    section: DEFAULT
+    option: net_config_override
+    value: "/home/stack/undercloud_net_config.json.template"
+
 - name: Run the undercloud installation
   shell: openstack undercloud install
 
@@ -212,24 +268,3 @@
     source /home/stack/stackrc
     openstack subnet set --dns-nameserver {{ dns_server_1 }} default-subnet
   when: default_subnet_has_name is failed
-
-# Non-standard Cisco additions to the installer process from here on:
-
-# Cisco specific addition for fake floating ip address gateway
-- name: Make sure NetworkManager is not running
-  systemd:
-    state: stopped
-    name: NetworkManager
-  become: true
-
-- name: Add fake floating ip network gateway
-  shell: >
-    ip addr | grep -q {{ undercloud_fake_gw_cidr }} ||
-    ip addr add {{ undercloud_fake_gw_cidr }} dev {{ undercloud_fake_gw_interface }}
-  become: true
-
-- name: Add IP in overcloud routable network
-  shell: >
-    ip addr | grep -q {{ overcloud_director_ip }} ||
-    ip addr add {{ overcloud_director_ip }} dev usernet
-  become: true

installer/step2-install-undercloud/osp13/tasks.yaml

@@ -104,7 +104,7 @@
     path: /home/stack/undercloud.conf
     section: DEFAULT
     option: local_interface
-    value: pxe-int
+    value: "{{ undercloud_local_interface }}"
 
 - name: Set local_ip in undercloud.conf
   ini_file:
@@ -171,6 +171,63 @@
     option: undercloud_admin_password
     value: password
 
+# Based on https://github.com/openstack/instack-undercloud/blob/newton-eol/templates/net-config.json.template
+# adds Cisco environment specific interfaces that need configuring
+- name: Write out the undercloud net config override
+  copy:
+    dest: /home/stack/undercloud_net_config.json.template
+    content: |
+      {% raw -%}
+      "network_config": [
+         {
+          "type": "ovs_bridge",
+          "name": "br-ctlplane",
+          "ovs_extra": [
+           "br-set-external-id br-ctlplane bridge-id br-ctlplane"
+          ],
+          "members": [
+           {
+            "type": "interface",
+            "name": "{{LOCAL_INTERFACE}}",
+            "primary": "true",
+            "mtu": {{LOCAL_MTU}}
+           }
+          ],
+          "addresses": [
+            {
+              "ip_netmask": "{{PUBLIC_INTERFACE_IP}}"
+            }
+          ],
+          "mtu": {{LOCAL_MTU}}
+        },
+      {% endraw %}
+        {
+          "type": "interface",
+          "name": "{{ undercloud_overcloud_interface }}",
+          "addresses": [
+            {
+              "ip_netmask": "{{ overcloud_director_ip }}"
+            }
+          ]
+        },
+        {
+          "type": "interface",
+          "name": "{{ undercloud_fake_gw_interface }}",
+          "addresses": [
+            {
+              "ip_netmask": "{{ undercloud_fake_gw_cidr }}"
+            }
+          ]
+        }
+      ]
+
+- name: Set net config override in undercloud config
+  ini_file:
+    path: /home/stack/undercloud.conf
+    section: DEFAULT
+    option: net_config_override
+    value: "/home/stack/undercloud_net_config.json.template"
+
 # 4.7. INSTALLING THE DIRECTOR
 - name: Run the undercloud installation
   shell: openstack undercloud install
@@ -208,25 +265,6 @@
 
 # Non-standard Cisco additions to the installer process from here on:
 
-# Cisco specific addition for fake floating ip address gateway
-- name: Make sure NetworkManager is not running
-  systemd:
-    state: stopped
-    name: NetworkManager
-  become: true
-
-- name: Add fake floating ip network gateway
-  shell: >
-    ip addr | grep -q {{ undercloud_fake_gw_cidr }} ||
-    ip addr add {{ undercloud_fake_gw_cidr }} dev {{ undercloud_fake_gw_interface }}
-  become: true
-
-- name: Add IP in overcloud routable network
-  shell: >
-    ip addr | grep -q {{ overcloud_director_ip }} ||
-    ip addr add {{ overcloud_director_ip }} dev usernet
-  become: true
-
 # Work around for python-gabbi version being out of date
 
 - name: Work around for BZ1613475

installer/step3-install-overcloud.yaml

@@ -20,4 +20,5 @@
   vars:
     ansible_user: stack
   tasks:
-  - include_tasks: "step3-install-overcloud/{{ dci_topic | lower }}/tasks.yaml"
+    - name: Include tasks for OSP version
+      include_tasks: "step3-install-overcloud/{{ dci_topic | lower }}/tasks.yaml"

installer/step3-install-overcloud/osp10/tasks.yaml

@@ -195,16 +195,20 @@
         deploy_stdout:
           value: {get_attr: [InstallOverrideDefaultPackagesController, deploy_stdout]}
 
-- name: Write out networking-cisco specific config environment
+- name: Write out networking-cisco specific config environment resources
   copy:
-    dest: /home/stack/environments/networking-cisco-config.yaml
+    dest: /home/stack/environments/networking-cisco-config-resources.yaml
     content: |
       resource_registry:
         OS::TripleO::NodeUserData: /usr/share/openstack-tripleo-heat-templates/firstboot/os-net-config-mappings.yaml
         OS::TripleO::ControllerExtraConfigPre: /home/stack/templates/controller_extra_config_prepuppet.yaml
         OS::TripleO::AllNodesExtraConfig: /home/stack/templates/extended_nodes_extra_config.yaml
         OS::TripleO::NetCiscoOriginal: /usr/share/openstack-tripleo-heat-templates/puppet/extraconfig/all_nodes/neutron-ml2-cisco-nexus-ucsm.yaml
 
+- name: Write out networking-cisco specific config environment params
+  copy:
+    dest: /home/stack/environments/networking-cisco-config-params.yaml
+    content: |
       parameter_defaults:
         InternalApiNetworkVlanID: {{ testbed_vlan }}
         StorageNetworkVlanID: {{ storage_vlan }}
@@ -264,12 +268,18 @@
         ComputeHostnameFormat: '{{ overcloud_node_prefix }}-%stackname%-compute-%index%'
         ControllerHostnameFormat: '{{ overcloud_node_prefix }}-%stackname%-controller-%index%'
 
-- name: Write out RHEL subscription manager environment file
+- name: Write out RHEL subscription manager environment file delete sub
   copy:
-    dest: /home/stack/environments/rhel_sub_config.yaml
+    dest: /home/stack/environments/delete_rhelsub.yaml
     content: |
       parameter_defaults:
         DeleteOnRHELUnregistration: true
+
+- name: Write out RHEL subscription manager environment file parameters
+  copy:
+    dest: /home/stack/environments/rhel_sub_config.yaml
+    content: |
+      parameter_defaults:
         rhel_reg_auto_attach: ""
         rhel_reg_activation_key: ""
         rhel_reg_org: ""
@@ -302,7 +312,9 @@
         -e /home/stack/environments/overcloud-config.yaml \
         -e /usr/share/openstack-tripleo-heat-templates/environments/network-isolation.yaml \
         -e /usr/share/openstack-tripleo-heat-templates/environments/net-bond-with-vlans.yaml \
-        -e /home/stack/environments/networking-cisco-config.yaml \
+        -e /home/stack/environments/networking-cisco-config-resources.yaml \
+        -e /home/stack/environments/networking-cisco-config-params.yaml \
+        -e /home/stack/environments/delete_rhelsub.yaml \
         -e /home/stack/environments/rhel_sub_config.yaml \
         -e /usr/share/openstack-tripleo-heat-templates/extraconfig/pre_deploy/rhel-registration/rhel-registration-resource-registry.yaml \
         --ntp-server 1.ntp.esl.cisco.com