X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?p=apex.git;a=blobdiff_plain;f=lib%2Fansible%2Fplaybooks%2Fdeploy_overcloud.yml;fp=lib%2Fansible%2Fplaybooks%2Fdeploy_overcloud.yml;h=9a405814f1ced993a842e3f73f700fb1afbb6fb8;hp=44470da2c231b2b2a27e8099099a10e3d596caea;hb=90b96136c3cc8d74159a45afdfd38ea054d5fc66;hpb=4cbad53ea9293fd51c5ffc368ca01787549472f7

diff --git a/lib/ansible/playbooks/deploy_overcloud.yml b/lib/ansible/playbooks/deploy_overcloud.yml
index 44470da2..9a405814 100644
--- a/lib/ansible/playbooks/deploy_overcloud.yml
+++ b/lib/ansible/playbooks/deploy_overcloud.yml
@@ -78,7 +78,13 @@
         ruby -e '
         require "yaml"
         data = YAML.load(File.read("/usr/share/openstack-tripleo-heat-templates/roles_data.yaml"))
-        data[1]["networks"].push("External")
+        if data[1]["networks"].is_a?(Array)
+          data[1]["networks"].push("External")
+        elsif data[1]["networks"].is_a?(Hash)
+          data[1]["networks"].merge!("External"=> { "subnet" => "external_subnet" })
+        else
+          raise "Unable to determine data to modify in roles_data.yaml"
+        end
         data[1]["default_route_networks"] = Array.new(["External"])
         File.open("/usr/share/openstack-tripleo-heat-templates/roles_data.yaml", "w") { |f| f.write(data.to_yaml) }
         '
@@ -115,6 +121,7 @@
       shell: >
         /usr/share/openstack-tripleo-heat-templates/tools/merge-new-params-nic-config-script.py
         -n /home/stack/network_data.yaml -t /home/stack/nics/{{ item }}.yaml --discard-comments True
+        --role-name Controller
       become: yes
       become_user: stack
       with_items: