From 78b0922198bbc066c7c555d2bd2bef576f76d4a3 Mon Sep 17 00:00:00 2001 From: Yair Fried Date: Wed, 2 Mar 2016 09:00:54 +0200 Subject: [PATCH 1/5] Revert Installer to old OSPD Keep the cli code, but revert playbooks, settings and roles --- playbooks/install.yml | 2 +- playbooks/installer/ospd/overcloud/pre.yml | 4 +- playbooks/installer/ospd/overcloud/run.yml | 4 +- playbooks/installer/ospd/undercloud/pre.yml | 27 +++--- .../overcloud/images/import/tasks/main.yml | 6 +- .../isolation/single-nic-vlans/tasks/main.yml | 4 +- .../templates/isolation.yml.j2 | 2 +- .../templates/network-environment.yaml.j2 | 2 +- roles/ospd/overcloud/ssl/tasks/main.yml | 2 +- .../overcloud/storage/ceph/tasks/main.yml | 6 +- .../storage/ceph/templates/ceph.yml.j2 | 4 +- settings/installer/base.spec | 12 --- settings/installer/{ospd => }/ospd.yml | 7 ++ settings/installer/ospd/build/latest.yml | 4 + settings/installer/ospd/images/import.yml | 9 ++ .../ospd/images/import/version/7.yml | 9 ++ .../ospd/images/import/version/8.yml | 8 ++ settings/installer/ospd/network/isolation.yml | 12 +++ .../ospd/network/isolation/protocol/ipv4.yml | 29 ++++++ .../ospd/network/isolation/protocol/ipv6.yml | 30 ++++++ .../isolation/type/single-nic-vlans.yml | 9 ++ .../isolation/type/three-nics-vlans.yml | 9 ++ .../ospd/network/isolation/variant/gre.yml | 6 ++ .../ospd/network/isolation/variant/sriov.yml | 7 ++ .../ospd/network/isolation/variant/vlan.yml | 6 ++ .../ospd/network/isolation/variant/vxlan.yml | 6 ++ .../installer/ospd/network/no-isolation.yml | 8 ++ .../installer/ospd/network/templates/ipv4.yml | 22 ----- .../installer/ospd/network/templates/ipv6.yml | 22 ----- settings/installer/ospd/ospd.spec | 92 ------------------- settings/installer/ospd/ssl/no.yml | 5 + settings/installer/ospd/ssl/yes.yml | 5 + settings/installer/ospd/storage/ceph.yml | 12 +++ .../ospd/storage/ceph/external/yes.yml | 16 ++++ .../ospd/storage/templates/external.yml | 10 -- .../ospd/storage/templates/internal.yml | 5 - settings/installer/ospd/version/7.yml | 9 ++ settings/installer/ospd/version/7/minor/1.yml | 5 + settings/installer/ospd/version/7/minor/2.yml | 5 + settings/installer/ospd/version/7/minor/3.yml | 5 + settings/installer/ospd/version/8.yml | 8 ++ settings/installer/ospd/version/8/minor/0.yml | 5 + 42 files changed, 263 insertions(+), 197 deletions(-) delete mode 100644 settings/installer/base.spec rename settings/installer/{ospd => }/ospd.yml (93%) create mode 100644 settings/installer/ospd/build/latest.yml create mode 100644 settings/installer/ospd/images/import.yml create mode 100644 settings/installer/ospd/images/import/version/7.yml create mode 100644 settings/installer/ospd/images/import/version/8.yml create mode 100644 settings/installer/ospd/network/isolation.yml create mode 100644 settings/installer/ospd/network/isolation/protocol/ipv4.yml create mode 100644 settings/installer/ospd/network/isolation/protocol/ipv6.yml create mode 100644 settings/installer/ospd/network/isolation/type/single-nic-vlans.yml create mode 100644 settings/installer/ospd/network/isolation/type/three-nics-vlans.yml create mode 100644 settings/installer/ospd/network/isolation/variant/gre.yml create mode 100644 settings/installer/ospd/network/isolation/variant/sriov.yml create mode 100644 settings/installer/ospd/network/isolation/variant/vlan.yml create mode 100644 settings/installer/ospd/network/isolation/variant/vxlan.yml create mode 100644 settings/installer/ospd/network/no-isolation.yml delete mode 100644 settings/installer/ospd/network/templates/ipv4.yml delete mode 100644 settings/installer/ospd/network/templates/ipv6.yml delete mode 100644 settings/installer/ospd/ospd.spec create mode 100644 settings/installer/ospd/ssl/no.yml create mode 100644 settings/installer/ospd/ssl/yes.yml create mode 100644 settings/installer/ospd/storage/ceph.yml create mode 100644 settings/installer/ospd/storage/ceph/external/yes.yml delete mode 100644 settings/installer/ospd/storage/templates/external.yml delete mode 100644 settings/installer/ospd/storage/templates/internal.yml create mode 100644 settings/installer/ospd/version/7.yml create mode 100644 settings/installer/ospd/version/7/minor/1.yml create mode 100644 settings/installer/ospd/version/7/minor/2.yml create mode 100644 settings/installer/ospd/version/7/minor/3.yml create mode 100644 settings/installer/ospd/version/8.yml create mode 100644 settings/installer/ospd/version/8/minor/0.yml diff --git a/playbooks/install.yml b/playbooks/install.yml index 67e8f0f43f..14e01cb2bb 100644 --- a/playbooks/install.yml +++ b/playbooks/install.yml @@ -3,7 +3,7 @@ hosts: openstack_nodes sudo: yes tasks: - - debug: "var={{ installer.selinux | default('enforcing') }}" + - selinux: policy=targeted state={{ installer.selinux|default('enforcing') }} - name: Ensure yum presence hosts: openstack_nodes diff --git a/playbooks/installer/ospd/overcloud/pre.yml b/playbooks/installer/ospd/overcloud/pre.yml index 299ba1c3d4..94af5881e1 100644 --- a/playbooks/installer/ospd/overcloud/pre.yml +++ b/playbooks/installer/ospd/overcloud/pre.yml @@ -11,8 +11,8 @@ msg: "Stopping before building/importing the images per user request" when: break is defined and break == "before_images" roles: - - {role: ospd/overcloud/images/build, when: installer.overcloud.images is not defined installer.overcloud.images.server is not defined} - - {role: ospd/overcloud/images/import, when: installer.overcloud.images is defined and installer.overcloud.images.server is defined} + - {role: ospd/overcloud/images/build, when: installer.images.task == "build"} + - {role: ospd/overcloud/images/import, when: installer.images.task == "import"} tasks: - name: upload the overcloud images to glance shell: "source ~/stackrc; openstack overcloud image upload" diff --git a/playbooks/installer/ospd/overcloud/run.yml b/playbooks/installer/ospd/overcloud/run.yml index 6cbb1eb89e..baad40cc12 100644 --- a/playbooks/installer/ospd/overcloud/run.yml +++ b/playbooks/installer/ospd/overcloud/run.yml @@ -18,9 +18,9 @@ dest: "~/overcloud_deploy.sh" mode: 0755 roles: - - {role: "ospd/overcloud/storage/ceph/", when: provisioner.nodes.ceph is defined or installer.overcloud.storage.type == "external"} + - {role: "ospd/overcloud/storage/ceph/", when: provisioner.nodes.ceph is defined or installer.overcloud.storage.external == "yes"} - {role: "ospd/overcloud/network/isolation/{{ installer.overcloud.network.isolation.type }}/", when: installer.overcloud.network.isolation.enable == "yes"} - - {role: "ospd/overcloud/ssl/", when: installer.overcloud.network.ssl == "yes"} + - {role: "ospd/overcloud/ssl/", when: installer.overcloud.use_ssl == "yes"} - name: Install the overcloud hosts: undercloud diff --git a/playbooks/installer/ospd/undercloud/pre.yml b/playbooks/installer/ospd/undercloud/pre.yml index 831b9b8770..40fb6cd519 100644 --- a/playbooks/installer/ospd/undercloud/pre.yml +++ b/playbooks/installer/ospd/undercloud/pre.yml @@ -16,52 +16,47 @@ command: "rm -f /etc/yum.repos.d/*" - name: install the rhos-release RPM - shell: "yum localinstall -y {{ installer.product.rpm }}" + shell: "yum localinstall -y {{ product.rpm }}" - debug: - msg: "rhos-release {{ installer.product.version }}-director -p {{ installer.product.build }}" + msg: "rhos-release {{ installer.version.major }}-director -p {{ installer.build }}" - name: create necessary repos with for director using rhos-release - command: "rhos-release {{ installer.product.version }}-director -p {{ installer.product.build }}" + command: "rhos-release {{ installer.version.major }}-director -p {{ installer.build }}" register: command_result until: command_result.stderr.find('Connection reset by peer') == -1 retries: 40 delay: 5 - debug: - msg: "rhos-release {{ installer.productcore.version }} -p {{ installer.product.core.build }}" - when: prodcut.core is defined + msg: "rhos-release {{ product.version.major }} -p {{ product.build }}" - name: create necessary repos for core using rhos-release - command: "rhos-release {{ installer.productcore.version }} -p {{ installer.product.core.build }}" - when: prodcut.core is defined + command: "rhos-release {{ product.version.major }} -p {{ product.build }}" - name: update system packages - yum: - state: latest - name: "*" - register: update + shell: "yum update -y" - name: reboot the undercloud shell: "sleep 2 && shutdown -r now" async: 1 poll: 0 ignore_errors: true - when: update|changed +- name: Waiting for host to startup + hosts: localhost + tasks: - name: Waiting for the undercloud to be available - delegate_to: localhost wait_for: - host: "{{ hostvars[inventory_hostname].ansible_ssh_host }}" + host: "undercloud" timeout: 120 - when: update|changed - name: Continue with the undercloud installation hosts: undercloud tasks: - name: Install the oscplugin/tripleO client yum: - name: "{% if installer.product.version == '7' %}python-rdomanager-oscplugin{% else %}python-tripleoclient{% endif %}" + name: "{% if installer.version.major == 7 %}python-rdomanager-oscplugin{% else %}python-tripleoclient{% endif %}" state: present - name: create user diff --git a/roles/ospd/overcloud/images/import/tasks/main.yml b/roles/ospd/overcloud/images/import/tasks/main.yml index fc5b2e35ce..39474843ef 100644 --- a/roles/ospd/overcloud/images/import/tasks/main.yml +++ b/roles/ospd/overcloud/images/import/tasks/main.yml @@ -7,9 +7,9 @@ - name: download the pre-built overcloud images shell: > wget --quiet -c -O ~/{{ item.value }} - "{{ installer.overcloud.images.server }}/{{ item.value }}" - with_dict: "{{ installer.overcloud.images.files }}" + "{{ installer.images.base_url }}/{{ item.value }}" + with_dict: "{{ installer.images.overcloud.files }}" - name: untar the images shell: "tar -xvf ~/{{ item.value }}" - with_dict: "{{ installer.overcloud.images.files }}" + with_dict: "{{ installer.images.overcloud.files }}" diff --git a/roles/ospd/overcloud/network/isolation/single-nic-vlans/tasks/main.yml b/roles/ospd/overcloud/network/isolation/single-nic-vlans/tasks/main.yml index 2b2b49258c..5c25b9ecd5 100644 --- a/roles/ospd/overcloud/network/isolation/single-nic-vlans/tasks/main.yml +++ b/roles/ospd/overcloud/network/isolation/single-nic-vlans/tasks/main.yml @@ -17,9 +17,9 @@ line: ' -e {{ installer.overcloud.template_base }}/{{ installer.overcloud.network.isolation.file }} \\' - name: add port to br-ctlplane for ipv6 over vlan support - shell: "sudo ovs-vsctl add-port br-ctlplane vlan{{ installer.overcloud.network.template.parameter_defaults.ExternalNetworkVlanID }} tag={{ installer.overcloud.network.template.parameter_defaults.ExternalNetworkVlanID }} -- set interface vlan{{ installer.overcloud.network.template.parameter_defaults.ExternalNetworkVlanID }} type=internal" + shell: "sudo ovs-vsctl add-port br-ctlplane vlan{{ installer.overcloud.network.template.content.parameter_defaults.ExternalNetworkVlanID }} tag={{ installer.overcloud.network.template.content.parameter_defaults.ExternalNetworkVlanID }} -- set interface vlan{{ installer.overcloud.network.template.content.parameter_defaults.ExternalNetworkVlanID }} type=internal" when: installer.overcloud.network.backend == 'vlan' - name: add the ipv6 address - shell: "sudo ip l set dev vlan{{ installer.overcloud.network.template.parameter_defaults.ExternalNetworkVlanID }} up; sudo ip addr add {{ installer.overcloud.network.template.parameter_defaults.ExternalInterfaceDefaultRoute }}/64 dev vlan{{ installer.overcloud.network.template.parameter_defaults.ExternalNetworkVlanID }}" + shell: "sudo ip l set dev vlan{{ installer.overcloud.network.template.content.parameter_defaults.ExternalNetworkVlanID }} up; sudo ip addr add {{ installer.overcloud.network.template.content.parameter_defaults.ExternalInterfaceDefaultRoute }}/64 dev vlan{{ installer.overcloud.network.template.content.parameter_defaults.ExternalNetworkVlanID }}" when: installer.overcloud.network.backend == 'vlan' diff --git a/roles/ospd/overcloud/network/isolation/single-nic-vlans/templates/isolation.yml.j2 b/roles/ospd/overcloud/network/isolation/single-nic-vlans/templates/isolation.yml.j2 index e331c07b90..46a1c1c3c1 100644 --- a/roles/ospd/overcloud/network/isolation/single-nic-vlans/templates/isolation.yml.j2 +++ b/roles/ospd/overcloud/network/isolation/single-nic-vlans/templates/isolation.yml.j2 @@ -1 +1 @@ -{{ installer.overcloud.network.template | to_yaml }} +{{ installer.overcloud.network.template.content | to_yaml }} diff --git a/roles/ospd/overcloud/network/isolation/three-nics-vlans/templates/network-environment.yaml.j2 b/roles/ospd/overcloud/network/isolation/three-nics-vlans/templates/network-environment.yaml.j2 index e331c07b90..46a1c1c3c1 100644 --- a/roles/ospd/overcloud/network/isolation/three-nics-vlans/templates/network-environment.yaml.j2 +++ b/roles/ospd/overcloud/network/isolation/three-nics-vlans/templates/network-environment.yaml.j2 @@ -1 +1 @@ -{{ installer.overcloud.network.template | to_yaml }} +{{ installer.overcloud.network.template.content | to_yaml }} diff --git a/roles/ospd/overcloud/ssl/tasks/main.yml b/roles/ospd/overcloud/ssl/tasks/main.yml index a28c76a790..5a34041852 100644 --- a/roles/ospd/overcloud/ssl/tasks/main.yml +++ b/roles/ospd/overcloud/ssl/tasks/main.yml @@ -2,7 +2,7 @@ shell: "openssl genrsa -out {{ installer.overcloud.template_base }}/overcloud-privkey.pem 2048" - name: create the self signed CA certificate - shell: "openssl req -new -x509 -key {{ installer.overcloud.template_base }}/overcloud-privkey.pem -out {{ installer.overcloud.template_base }}/overcloud-cacert.pem -days 365 -subj '/C=US/ST=NC/L=Raleigh/O=Red HAt/OU=QE/CN={{ installer.overcloud.network.template.parameter_defaults.ExternalAllocationPools[0].start }}'" + shell: "openssl req -new -x509 -key {{ installer.overcloud.template_base }}/overcloud-privkey.pem -out {{ installer.overcloud.template_base }}/overcloud-cacert.pem -days 365 -subj '/C=US/ST=NC/L=Raleigh/O=Red HAt/OU=QE/CN={{ installer.overcloud.network.template.content.parameter_defaults.ExternalAllocationPools[0].start }}'" - name: update the tls template shell: "sed -i 's/CLOUDNAME/IP_ADDRESS/' {{ installer.overcloud.template_base }}/environments/enable-tls.yaml" diff --git a/roles/ospd/overcloud/storage/ceph/tasks/main.yml b/roles/ospd/overcloud/storage/ceph/tasks/main.yml index 11e7a5bba5..d6752bde43 100644 --- a/roles/ospd/overcloud/storage/ceph/tasks/main.yml +++ b/roles/ospd/overcloud/storage/ceph/tasks/main.yml @@ -8,13 +8,13 @@ lineinfile: dest: "~/overcloud_deploy.sh" line: ' --ceph-storage-scale {{ groups["ceph"]| length }} \\' - when: installer.overcloud.storage.type == "internal" + when: installer.overcloud.storage.external == "no" - name: append the ceph storage template line to the base overcloud deploy script lineinfile: dest: "~/overcloud_deploy.sh" line: '{% for flavor in tagged_flavors %}{% if flavor.cmd is defined and "ceph" in flavor.cmd %} --ceph-storage-flavor {{ flavor.cmd.split() | last }} \\{% endif %}{% endfor %}' - when: installer.overcloud.storage.type == "internal" + when: installer.overcloud.storage.external == "no" - name: append the storage template line to the base overcloud deploy script lineinfile: @@ -24,4 +24,4 @@ - name: append the storage ceph custom template line to the base overcloud deploy script lineinfile: dest: "~/overcloud_deploy.sh" - line: ' -e {{ installer.overcloud.template_base }}/custom-ceph.yaml \\' + line: ' -e {{ installer.overcloud.template_base }}/custom-ceph.yaml \\' \ No newline at end of file diff --git a/roles/ospd/overcloud/storage/ceph/templates/ceph.yml.j2 b/roles/ospd/overcloud/storage/ceph/templates/ceph.yml.j2 index 44fe77dbfb..456cc58737 100644 --- a/roles/ospd/overcloud/storage/ceph/templates/ceph.yml.j2 +++ b/roles/ospd/overcloud/storage/ceph/templates/ceph.yml.j2 @@ -5,8 +5,8 @@ parameters: NovaEnableRbdBackend: true GlanceBackend: rbd -{{ installer.overcloud.storage.template |to_nice_yaml }} -{% if installer.overcloud.storage.type == "external" %} +{{ installer.overcloud.storage.template.content |to_nice_yaml }} +{% if installer.overcloud.storage.external == "yes" %} resource_registry: OS::TripleO::CephClusterConfig::SoftwareConfig: /usr/share/openstack-tripleo-heat-templates/puppet/extraconfig/ceph/ceph-external-config.yaml {% else %} diff --git a/settings/installer/base.spec b/settings/installer/base.spec deleted file mode 100644 index a91d67f010..0000000000 --- a/settings/installer/base.spec +++ /dev/null @@ -1,12 +0,0 @@ ---- -options: - verbose: - help: 'Verbosity level' - short: v - action: count - default: 0 - inventory: - help: 'Inventory file' - short: i - type: str - default: hosts diff --git a/settings/installer/ospd/ospd.yml b/settings/installer/ospd.yml similarity index 93% rename from settings/installer/ospd/ospd.yml rename to settings/installer/ospd.yml index 4975b5699e..466f4d35ae 100644 --- a/settings/installer/ospd/ospd.yml +++ b/settings/installer/ospd.yml @@ -32,6 +32,13 @@ installer: - ' -A INPUT -p udp --sport 123 -m comment --comment "006 QA incoming NTP" -j ACCEPT' - ' -P INPUT DROP' +defaults: + build: latest + images: import + network: "no-isolation" + version: 7 + ssl: "no" + workarounds: rhbz1304367: desc: "Overcloud deployment finished successfully and Ceph's OSDs are down" diff --git a/settings/installer/ospd/build/latest.yml b/settings/installer/ospd/build/latest.yml new file mode 100644 index 0000000000..a3de636542 --- /dev/null +++ b/settings/installer/ospd/build/latest.yml @@ -0,0 +1,4 @@ +--- + +installer: + build: latest diff --git a/settings/installer/ospd/images/import.yml b/settings/installer/ospd/images/import.yml new file mode 100644 index 0000000000..fa2d4ed17c --- /dev/null +++ b/settings/installer/ospd/images/import.yml @@ -0,0 +1,9 @@ +--- + +installer: + images: + base_url: "{{ !lookup private.installer.images.{{ !lookup product.build }} }}" + task: import + +defaults: + version: 7 diff --git a/settings/installer/ospd/images/import/version/7.yml b/settings/installer/ospd/images/import/version/7.yml new file mode 100644 index 0000000000..ecd7e3e70c --- /dev/null +++ b/settings/installer/ospd/images/import/version/7.yml @@ -0,0 +1,9 @@ +--- + +installer: + images: + overcloud: + files: + discovery: "discovery-ramdisk.tar" + deployment: "deploy-ramdisk-ironic.tar" + overcloud: "overcloud-full.tar" diff --git a/settings/installer/ospd/images/import/version/8.yml b/settings/installer/ospd/images/import/version/8.yml new file mode 100644 index 0000000000..9734bba997 --- /dev/null +++ b/settings/installer/ospd/images/import/version/8.yml @@ -0,0 +1,8 @@ +--- + +installer: + images: + overcloud: + files: + discovery: "ironic-python-agent.tar" + overcloud: "overcloud-full.tar" diff --git a/settings/installer/ospd/network/isolation.yml b/settings/installer/ospd/network/isolation.yml new file mode 100644 index 0000000000..6e0e34e3f2 --- /dev/null +++ b/settings/installer/ospd/network/isolation.yml @@ -0,0 +1,12 @@ +--- +#TODO: move everything out of isolation, have isolation as it's own option +installer: + overcloud: + network: + isolation: + enable: "yes" + +defaults: + protocol: ipv4 + type: "three-nics-vlan" + variant: vxlan diff --git a/settings/installer/ospd/network/isolation/protocol/ipv4.yml b/settings/installer/ospd/network/isolation/protocol/ipv4.yml new file mode 100644 index 0000000000..3dd2bd8cfb --- /dev/null +++ b/settings/installer/ospd/network/isolation/protocol/ipv4.yml @@ -0,0 +1,29 @@ +--- + +installer: + overcloud: + network: + protocol: ipv4 + template: + content: + parameter_defaults: + InternalApiNetCidr: 172.17.1.0/24 + InternalApiAllocationPools: [{'start': '172.17.1.10', 'end': '172.17.1.200'}] + InternalApiNetworkVlanID: 101 + TenantNetCidr: 172.17.2.0/24 + TenantAllocationPools: [{'start': '172.17.2.10', 'end': '172.17.2.200'}] + TenantNetworkVlanID: 201 + StorageNetCidr: 172.17.3.0/24 + StorageAllocationPools: [{'start': '172.17.3.10', 'end': '172.17.3.200'}] + StorageNetworkVlanID: 301 + StorageMgmtNetCidr: 172.17.4.0/24 + StorageMgmtAllocationPools: [{'start': '172.17.4.10', 'end': '172.17.4.200'}] + StorageMgmtNetworkVlanID: 401 + ExternalNetCidr: 192.168.1.0/24 + ExternalAllocationPools: [{'start': '192.168.1.101', 'end': '192.168.1.149'}] + ExternalInterfaceDefaultRoute: 192.168.1.1 + ExternalNetworkVlanID: 501 + ControlPlaneSubnetCidr: "24" + ControlPlaneDefaultRoute: 172.16.0.1 + EC2MetadataIp: 172.16.0.1 + DnsServers: ['192.168.1.1', '8.8.8.8'] diff --git a/settings/installer/ospd/network/isolation/protocol/ipv6.yml b/settings/installer/ospd/network/isolation/protocol/ipv6.yml new file mode 100644 index 0000000000..a8f38a8500 --- /dev/null +++ b/settings/installer/ospd/network/isolation/protocol/ipv6.yml @@ -0,0 +1,30 @@ +--- + +installer: + overcloud: + network: + backend: vlan + protocol: ipv6 + template: + content: + parameter_defaults: + InternalApiNetCidr: 'fd00:fd00:fd00:2000::/64' + InternalApiAllocationPools: [{'start': 'fd00:fd00:fd00:2000::10', 'end': 'fd00:fd00:fd00:2000:ffff:ffff:ffff:fffe'}] + InternalApiNetworkVlanID: 101 + TenantNetCidr: 'fd00:fd00:fd00:5000::/64' + TenantAllocationPools: [{'start': 'fd00:fd00:fd00:5000::10', 'end': 'fd00:fd00:fd00:5000:ffff:ffff:ffff:fffe'}] + TenantNetworkVlanID: 201 + StorageNetCidr: 'fd00:fd00:fd00:3000::/64' + StorageAllocationPools: [{'start': 'fd00:fd00:fd00:3000::10', 'end': 'fd00:fd00:fd00:3000:ffff:ffff:ffff:fffe'}] + StorageNetworkVlanID: 301 + StorageMgmtNetCidr: 'fd00:fd00:fd00:4000::/64' + StorageMgmtAllocationPools: [{'start': 'fd00:fd00:fd00:4000::10', 'end': 'fd00:fd00:fd00:4000:ffff:ffff:ffff:fffe'}] + StorageMgmtNetworkVlanID: 401 + ExternalNetCidr: '2620:52:0:13b8::/64' + ExternalAllocationPools: [{'start': '2620:52:0:13b8:5054:ff:fe3e:1', 'end': '2620:52:0:13b8:5054:ff:fe3e:9'}] + ExternalInterfaceDefaultRoute: 2620:52:0:13b8::fe + ExternalNetworkVlanID: 501 + ControlPlaneSubnetCidr: "24" + ControlPlaneDefaultRoute: 172.16.0.1 + EC2MetadataIp: 172.16.0.1 + DnsServers: ['192.168.1.1', '8.8.8.8'] diff --git a/settings/installer/ospd/network/isolation/type/single-nic-vlans.yml b/settings/installer/ospd/network/isolation/type/single-nic-vlans.yml new file mode 100644 index 0000000000..f766d1245e --- /dev/null +++ b/settings/installer/ospd/network/isolation/type/single-nic-vlans.yml @@ -0,0 +1,9 @@ +--- + +installer: + overcloud: + network: + isolation: + enable: "yes" + type: "single-nic-vlans" + file: "environments/net-single-nic-with-vlans.yaml" diff --git a/settings/installer/ospd/network/isolation/type/three-nics-vlans.yml b/settings/installer/ospd/network/isolation/type/three-nics-vlans.yml new file mode 100644 index 0000000000..14fc9604c4 --- /dev/null +++ b/settings/installer/ospd/network/isolation/type/three-nics-vlans.yml @@ -0,0 +1,9 @@ +--- + +installer: + overcloud: + network: + isolation: + enable: "yes" + type: "three-nics-vlans" + file: "environments/net-single-nic-with-vlans.yaml" diff --git a/settings/installer/ospd/network/isolation/variant/gre.yml b/settings/installer/ospd/network/isolation/variant/gre.yml new file mode 100644 index 0000000000..146eace96a --- /dev/null +++ b/settings/installer/ospd/network/isolation/variant/gre.yml @@ -0,0 +1,6 @@ +--- + +installer: + overcloud: + network: + backend: gre diff --git a/settings/installer/ospd/network/isolation/variant/sriov.yml b/settings/installer/ospd/network/isolation/variant/sriov.yml new file mode 100644 index 0000000000..30ca32dd4a --- /dev/null +++ b/settings/installer/ospd/network/isolation/variant/sriov.yml @@ -0,0 +1,7 @@ +--- + +installer: + overcloud: + network: + backend: sriov + diff --git a/settings/installer/ospd/network/isolation/variant/vlan.yml b/settings/installer/ospd/network/isolation/variant/vlan.yml new file mode 100644 index 0000000000..e71d980824 --- /dev/null +++ b/settings/installer/ospd/network/isolation/variant/vlan.yml @@ -0,0 +1,6 @@ +--- + +installer: + overcloud: + network: + backend: vlan diff --git a/settings/installer/ospd/network/isolation/variant/vxlan.yml b/settings/installer/ospd/network/isolation/variant/vxlan.yml new file mode 100644 index 0000000000..46bb18b766 --- /dev/null +++ b/settings/installer/ospd/network/isolation/variant/vxlan.yml @@ -0,0 +1,6 @@ +--- + +installer: + overcloud: + network: + backend: vxlan diff --git a/settings/installer/ospd/network/no-isolation.yml b/settings/installer/ospd/network/no-isolation.yml new file mode 100644 index 0000000000..ed1d18aef1 --- /dev/null +++ b/settings/installer/ospd/network/no-isolation.yml @@ -0,0 +1,8 @@ +--- + +installer: + overcloud: + network: + isolation: + enable: "no" + backend: vxlan diff --git a/settings/installer/ospd/network/templates/ipv4.yml b/settings/installer/ospd/network/templates/ipv4.yml deleted file mode 100644 index 3e81ac28e2..0000000000 --- a/settings/installer/ospd/network/templates/ipv4.yml +++ /dev/null @@ -1,22 +0,0 @@ ---- -parameter_defaults: - InternalApiNetCidr: 172.17.1.0/24 - InternalApiAllocationPools: [{'start': '172.17.1.10', 'end': '172.17.1.200'}] - InternalApiNetworkVlanID: 101 - TenantNetCidr: 172.17.2.0/24 - TenantAllocationPools: [{'start': '172.17.2.10', 'end': '172.17.2.200'}] - TenantNetworkVlanID: 201 - StorageNetCidr: 172.17.3.0/24 - StorageAllocationPools: [{'start': '172.17.3.10', 'end': '172.17.3.200'}] - StorageNetworkVlanID: 301 - StorageMgmtNetCidr: 172.17.4.0/24 - StorageMgmtAllocationPools: [{'start': '172.17.4.10', 'end': '172.17.4.200'}] - StorageMgmtNetworkVlanID: 401 - ExternalNetCidr: 192.168.1.0/24 - ExternalAllocationPools: [{'start': '192.168.1.101', 'end': '192.168.1.149'}] - ExternalInterfaceDefaultRoute: 192.168.1.1 - ExternalNetworkVlanID: 501 - ControlPlaneSubnetCidr: "24" - ControlPlaneDefaultRoute: 172.16.0.1 - EC2MetadataIp: 172.16.0.1 - DnsServers: ['192.168.1.1', '8.8.8.8'] diff --git a/settings/installer/ospd/network/templates/ipv6.yml b/settings/installer/ospd/network/templates/ipv6.yml deleted file mode 100644 index c850983b04..0000000000 --- a/settings/installer/ospd/network/templates/ipv6.yml +++ /dev/null @@ -1,22 +0,0 @@ ---- -parameter_defaults: - InternalApiNetCidr: 'fd00:fd00:fd00:2000::/64' - InternalApiAllocationPools: [{'start': 'fd00:fd00:fd00:2000::10', 'end': 'fd00:fd00:fd00:2000:ffff:ffff:ffff:fffe'}] - InternalApiNetworkVlanID: 101 - TenantNetCidr: 'fd00:fd00:fd00:5000::/64' - TenantAllocationPools: [{'start': 'fd00:fd00:fd00:5000::10', 'end': 'fd00:fd00:fd00:5000:ffff:ffff:ffff:fffe'}] - TenantNetworkVlanID: 201 - StorageNetCidr: 'fd00:fd00:fd00:3000::/64' - StorageAllocationPools: [{'start': 'fd00:fd00:fd00:3000::10', 'end': 'fd00:fd00:fd00:3000:ffff:ffff:ffff:fffe'}] - StorageNetworkVlanID: 301 - StorageMgmtNetCidr: 'fd00:fd00:fd00:4000::/64' - StorageMgmtAllocationPools: [{'start': 'fd00:fd00:fd00:4000::10', 'end': 'fd00:fd00:fd00:4000:ffff:ffff:ffff:fffe'}] - StorageMgmtNetworkVlanID: 401 - ExternalNetCidr: '2620:52:0:13b8::/64' - ExternalAllocationPools: [{'start': '2620:52:0:13b8:5054:ff:fe3e:1', 'end': '2620:52:0:13b8:5054:ff:fe3e:9'}] - ExternalInterfaceDefaultRoute: 2620:52:0:13b8::fe - ExternalNetworkVlanID: 501 - ControlPlaneSubnetCidr: "24" - ControlPlaneDefaultRoute: 172.16.0.1 - EC2MetadataIp: 172.16.0.1 - DnsServers: ['192.168.1.1', '8.8.8.8'] diff --git a/settings/installer/ospd/ospd.spec b/settings/installer/ospd/ospd.spec deleted file mode 100644 index d244ff2692..0000000000 --- a/settings/installer/ospd/ospd.spec +++ /dev/null @@ -1,92 +0,0 @@ ---- -subparsers: - ospd: - help: Install OpenStack using OSP-d installer - options: - dry-run: - action: store_true - help: Only generate settings, skip the playbook execution stage - input-files: - action: append - type: str - help: Settings file to be merged first - short: n - output-file: - type: str - short: o - help: 'Name for the generated settings file (default: stdout)' - extra-vars: - action: append - short: e - help: Extra variables to be merged last - type: str - groups: - - title: Product details - description: | - Version and build of the procuct. use "core-*" to specify - core version and build. - options: - rpm: - required: true - help: Path to rhos-release rpm (URL or local) - version: - required: true - type: str - help: OSPd version [7, 7.3, 8, ...] - build: - type: str - default: "" - help: | - Specific puddle/poodle selection. - This can be a known-symlink (Y1, Z1, GA, etc.), or - a puddle date stamp in the form of YYYY-MM-DD.X - If specifiec, will override minor version. - If not specified, will default to latest. - core-version: - type: str - help: Use a different version of core bits. defaults to "version" - core-build: - type: str - help: | - Use a different build of core bits. defaults to "build". - If "core-version" is specified, defaults to "latest" - - title: network - description: Network configuration details for the Overcloud networks - options: - network-protocol: - choices: [ipv4, ipv6] - help: IP version for network - default: ipv4 - network-template: - help: | - Network configuration template file. Search first in template dir. - (default: /network/templates/__DEFAULT__) - default: ipv4.yml - ssl: - choices: ["yes", "no"] - help: Use SSL - default: "no" - network-isolation: - choices: ["yes", "no"] - help: Use Network Isolation - default: "no" - network-variant: - choices: [gre, vxlan, sriov, vlan] - default: vxlan - - title: Image Options - options: - image-server: - type: str - help: URL to images servers - - title: Storage Options - options: - storage-type: - choices: [internal, external] - default: internal - help: | - Use internal/external storage - storage-template: - help: | - Storage configuration template file. Search first in templates dir. - (default: match storage type) - diff --git a/settings/installer/ospd/ssl/no.yml b/settings/installer/ospd/ssl/no.yml new file mode 100644 index 0000000000..4fc6cf7707 --- /dev/null +++ b/settings/installer/ospd/ssl/no.yml @@ -0,0 +1,5 @@ +--- + +installer: + overcloud: + use_ssl: "no" diff --git a/settings/installer/ospd/ssl/yes.yml b/settings/installer/ospd/ssl/yes.yml new file mode 100644 index 0000000000..1f95810c2f --- /dev/null +++ b/settings/installer/ospd/ssl/yes.yml @@ -0,0 +1,5 @@ +--- + +installer: + overcloud: + use_ssl: "yes" diff --git a/settings/installer/ospd/storage/ceph.yml b/settings/installer/ospd/storage/ceph.yml new file mode 100644 index 0000000000..f94d6aa559 --- /dev/null +++ b/settings/installer/ospd/storage/ceph.yml @@ -0,0 +1,12 @@ +--- + +installer: + overcloud: + storage: + external: "no" + template: + content: + parameter_defaults: + CinderRbdPoolName: "volumes" + NovaRbdPoolName: "vms" + GlanceRbdPoolName: "images" \ No newline at end of file diff --git a/settings/installer/ospd/storage/ceph/external/yes.yml b/settings/installer/ospd/storage/ceph/external/yes.yml new file mode 100644 index 0000000000..5e7e2f5bda --- /dev/null +++ b/settings/installer/ospd/storage/ceph/external/yes.yml @@ -0,0 +1,16 @@ +--- + +installer: + overcloud: + storage: + external: "yes" + template: + content: + parameter_defaults: + CinderRbdPoolName: "automation-cinder" + NovaRbdPoolName: "automation-nova" + GlanceRbdPoolName: "automation-glance" + CephClientUserName: "automation" + CephClientKey: "{{ !lookup private.storage.ceph.CephClientKey }}" + CephClusterFSID: "{{ !lookup private.storage.ceph.CephClusterFSID }}" + CephExternalMonHost: "{{ !lookup private.storage.ceph.CephExternalMonHost }}" \ No newline at end of file diff --git a/settings/installer/ospd/storage/templates/external.yml b/settings/installer/ospd/storage/templates/external.yml deleted file mode 100644 index 88ff50478c..0000000000 --- a/settings/installer/ospd/storage/templates/external.yml +++ /dev/null @@ -1,10 +0,0 @@ ---- -parameter_defaults: - CinderRbdPoolName: "automation-cinder" - NovaRbdPoolName: "automation-nova" - GlanceRbdPoolName: "automation-glance" - CephClientUserName: "automation" - CephClientKey: !placeholder "storage.ceph.CephClientKey" - # todo(yfried) enable once issue https://github.com/rhosqeauto/InfraRed/issues/55 is resulved - # CephClusterFSID: !placeholder "storage.ceph.CephClusterFSID" - # CephExternalMonHost: !placeholder "storage.ceph.CephExternalMonHost" diff --git a/settings/installer/ospd/storage/templates/internal.yml b/settings/installer/ospd/storage/templates/internal.yml deleted file mode 100644 index c4ff4f0ea2..0000000000 --- a/settings/installer/ospd/storage/templates/internal.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -parameter_defaults: - CinderRbdPoolName: "volumes" - NovaRbdPoolName: "vms" - GlanceRbdPoolName: "images" diff --git a/settings/installer/ospd/version/7.yml b/settings/installer/ospd/version/7.yml new file mode 100644 index 0000000000..5377ccc36e --- /dev/null +++ b/settings/installer/ospd/version/7.yml @@ -0,0 +1,9 @@ +--- + +installer: + version: + major: 7 + minor: 0 + +defaults: + minor: 3 diff --git a/settings/installer/ospd/version/7/minor/1.yml b/settings/installer/ospd/version/7/minor/1.yml new file mode 100644 index 0000000000..3eb89ed532 --- /dev/null +++ b/settings/installer/ospd/version/7/minor/1.yml @@ -0,0 +1,5 @@ +--- + +installer: + version: + minor: 1 diff --git a/settings/installer/ospd/version/7/minor/2.yml b/settings/installer/ospd/version/7/minor/2.yml new file mode 100644 index 0000000000..1d18970258 --- /dev/null +++ b/settings/installer/ospd/version/7/minor/2.yml @@ -0,0 +1,5 @@ +--- + +installer: + version: + minor: 2 diff --git a/settings/installer/ospd/version/7/minor/3.yml b/settings/installer/ospd/version/7/minor/3.yml new file mode 100644 index 0000000000..4ca2e02571 --- /dev/null +++ b/settings/installer/ospd/version/7/minor/3.yml @@ -0,0 +1,5 @@ +--- + +installer: + version: + minor: 3 diff --git a/settings/installer/ospd/version/8.yml b/settings/installer/ospd/version/8.yml new file mode 100644 index 0000000000..c5a18b9b55 --- /dev/null +++ b/settings/installer/ospd/version/8.yml @@ -0,0 +1,8 @@ +--- + +installer: + version: + major: 8 + +defaults: + minor: 0 diff --git a/settings/installer/ospd/version/8/minor/0.yml b/settings/installer/ospd/version/8/minor/0.yml new file mode 100644 index 0000000000..a409a9c035 --- /dev/null +++ b/settings/installer/ospd/version/8/minor/0.yml @@ -0,0 +1,5 @@ +--- + +installer: + version: + minor: 0 From ce3ae07af7ad429db327baad776be3088268ecde Mon Sep 17 00:00:00 2001 From: Yair Fried Date: Wed, 2 Mar 2016 09:09:49 +0200 Subject: [PATCH 2/5] Remove new installer unittests --- tests/test_cli_install.py | 156 -------------------------------------- 1 file changed, 156 deletions(-) delete mode 100644 tests/test_cli_install.py diff --git a/tests/test_cli_install.py b/tests/test_cli_install.py deleted file mode 100644 index ed20983819..0000000000 --- a/tests/test_cli_install.py +++ /dev/null @@ -1,156 +0,0 @@ -import os - -import pytest - - -ENTRY_POINT = 'installer' - - -@pytest.mark.parametrize('args, output', [ - ("ospd --rpm path_to_rpm --rpm path_to_rpm --version 7.3", - {"rpm": "path_to_rpm", - "build": "Y3", "version": "7"}), - ("ospd --rpm path_to_rpm --rpm path_to_rpm --version 7 --build latest", - {"rpm": "path_to_rpm", - "build": "latest", "version": "7"}), - ("ospd --rpm path_to_rpm --rpm path_to_rpm --version 7 --build Y3", - {"rpm": "path_to_rpm", - "build": "Y3", "version": "7"}), - ("ospd --rpm path_to_rpm --rpm path_to_rpm --version 7 " - "--build 2016-01-26.1", - {"rpm": "path_to_rpm", - "build": "2016-01-26.1", "version": "7"}), - ("ospd --rpm path_to_rpm --rpm path_to_rpm --version 8 " - "--build 2016-01-26.1 --core-version 7", - {"rpm": "path_to_rpm", - "build": "2016-01-26.1", - "version": "8", - "core": { - "version": "7", - "build": "latest"}}), - ("ospd --rpm path_to_rpm --rpm path_to_rpm --version 8 " - "--core-version 7", - {"rpm": "path_to_rpm", - "build": "latest", - "version": "8", - "core": { - "version": "7", - "build": "latest"}}), - ("ospd --rpm path_to_rpm --rpm path_to_rpm --version 8 " - "--core-build 2016-01-26.1", - {"rpm": "path_to_rpm", - "build": "latest", - "version": "8", - "core": { - "version": "8", - "build": "2016-01-26.1"}}), -]) -def test_product_repo(args, output): - from cli import install - - args = install.get_args(ENTRY_POINT, args=args.split(" ")) - product = install.set_product_repo(args) - assert output == product["installer"]["product"] - - -@pytest.mark.parametrize('args, output', [ - ("", - {"protocol": "ipv4", - "backend": "vxlan", - "isolation": { - "enable": "no"}, - "ssl": "no"}), - ("--network-protocol ipv6 --network-isolation yes --network-variant " - "sriov --ssl yes", - {"protocol": "ipv6", - "backend": "sriov", - "isolation": { - "enable": "yes", - "type": "three-nics-vlans", - 'file': "environments/net-three-nic-with-vlans.yaml"}, - "ssl": "yes"}), -]) -def test_set_network_details(args, output): - from cli import install - - args = "ospd --rpm path_to_rpm --version 7 " + args - args = args.strip(" ") - args = install.get_args(ENTRY_POINT, args=args.split(" ")) - network = install.set_network_details(args) - assert output == network["installer"]["overcloud"]["network"] - - -def test_set_network_template(): - import cli - from cli import install - - filename = "ipv4.yml" - def_path = os.path.join(install.get_settings_dir(ENTRY_POINT, ), - install.ENTRY_POINT, - "ospd", "network", - "templates") - act_filename = install.set_network_template(filename, - def_path) - cli_path = os.path.join(os.path.dirname(cli.__file__)) - ir_path = os.path.dirname(cli_path) - assert act_filename == os.path.join(ir_path, def_path, filename) - - from cli import exceptions - with pytest.raises(exceptions.IRFileNotFoundException): - install.set_network_template("bad/file/path", def_path) - - from tests.test_cwd import utils - alt_file = os.path.join(utils.TESTS_CWD, "placeholder_overwriter.yml") - new_act_filename = install.set_network_template(alt_file, def_path) - assert alt_file == new_act_filename - - -@pytest.mark.parametrize('args, output', [ - ("--rpm path_to_rpm --version 7 --image-server www.fake_url.to/images", - {"server": "www.fake_url.to/images", - "files": {"discovery": "discovery-ramdisk.tar", - "deployment": "deploy-ramdisk-ironic.tar", - "overcloud": "overcloud-full.tar"}}), - ("--rpm path_to_rpm --version 20 --image-server www.fake_url.to/images", - {"server": "www.fake_url.to/images", - "files": {"discovery": "ironic-python-agent.tar", - "overcloud": "overcloud-full.tar"}}) -]) -def test_set_image(args, output): - from cli import install - - args = "ospd " + args - args = install.get_args(ENTRY_POINT, args=args.split(" ")) - images = install.set_image(args) - assert images["installer"]["overcloud"]["images"] == output - - -def test_set_image_build(): - from cli import exceptions - from cli import install - - args = "ospd --rpm path_to_rpm --version 7" - args = install.get_args(ENTRY_POINT, args=args.split(" ")) - with pytest.raises(exceptions.IRNotImplemented): - install.set_image(args) - - -@pytest.mark.parametrize('args, output', [ - ("", - {"type": "internal", - "template": "internal.yml"}), - ("--storage-type external", - {"type": "external", - "template": "external.yml"}), - ("--storage-type external --storage-template fake_tmp", - {"type": "external", - "template": "fake_tmp"}) -]) -def test_set_storage(args, output): - from cli import install - - args = "ospd --rpm path_to_rpm --version 7 " + args - args = args.strip(" ") - args = install.get_args(ENTRY_POINT, args=args.split(" ")) - storage = install.set_storage(args) - assert storage["installer"]["overcloud"]["storage"] == output From 5efb0c7d533bb83687db8bd66a5da5e23e760dd6 Mon Sep 17 00:00:00 2001 From: Yair Fried Date: Wed, 2 Mar 2016 09:25:27 +0200 Subject: [PATCH 3/5] Pulls yum module fix --- playbooks/installer/ospd/undercloud/pre.yml | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/playbooks/installer/ospd/undercloud/pre.yml b/playbooks/installer/ospd/undercloud/pre.yml index 40fb6cd519..6b54db6d59 100644 --- a/playbooks/installer/ospd/undercloud/pre.yml +++ b/playbooks/installer/ospd/undercloud/pre.yml @@ -35,21 +35,24 @@ command: "rhos-release {{ product.version.major }} -p {{ product.build }}" - name: update system packages - shell: "yum update -y" + yum: + state: latest + name: "*" + register: update - name: reboot the undercloud shell: "sleep 2 && shutdown -r now" async: 1 poll: 0 ignore_errors: true + when: update|changed -- name: Waiting for host to startup - hosts: localhost - tasks: - name: Waiting for the undercloud to be available + delegate_to: localhost wait_for: - host: "undercloud" + host: "{{ hostvars[inventory_hostname].ansible_ssh_host }}" timeout: 120 + when: update|changed - name: Continue with the undercloud installation hosts: undercloud From 612673dc3f45df89721cecca823235827c7176b5 Mon Sep 17 00:00:00 2001 From: Yair Fried Date: Wed, 2 Mar 2016 09:48:20 +0200 Subject: [PATCH 4/5] Pull back settings/prodcut for old install --- settings/product/rhos.yml | 16 ++++++++++++++++ settings/product/rhos/repo/common/common.yml | 14 ++++++++++++++ settings/product/rhos/repo/poodle.yml | 9 +++++++++ settings/product/rhos/repo/puddle.yml | 6 ++++++ settings/product/rhos/version/7.0.yml | 9 +++++++++ settings/product/rhos/version/8.0.yml | 13 +++++++++++++ 6 files changed, 67 insertions(+) create mode 100644 settings/product/rhos.yml create mode 100644 settings/product/rhos/repo/common/common.yml create mode 100644 settings/product/rhos/repo/poodle.yml create mode 100644 settings/product/rhos/repo/puddle.yml create mode 100644 settings/product/rhos/version/7.0.yml create mode 100644 settings/product/rhos/version/8.0.yml diff --git a/settings/product/rhos.yml b/settings/product/rhos.yml new file mode 100644 index 0000000000..339700c84b --- /dev/null +++ b/settings/product/rhos.yml @@ -0,0 +1,16 @@ +--- + +product: + name: rhos + short_name: rh + config: + enable_epel: n + rpmrepo: + RedHat: "{{ !lookup private.distro.rhel.rhos_release_path }}" + +defaults: + version: 7.0 + repo: puddle + +workarounds: + bz1138740: {} # install nova-objectstore for S3 boto tests diff --git a/settings/product/rhos/repo/common/common.yml b/settings/product/rhos/repo/common/common.yml new file mode 100644 index 0000000000..82ad4c1a8a --- /dev/null +++ b/settings/product/rhos/repo/common/common.yml @@ -0,0 +1,14 @@ +product: + rpm: "{{ !lookup private.distro.rhel.rhos_release_rpm }}" + repo: + release: latest + location: bos + mirror: "download.eng.{{ !lookup product.repo.location }}.redhat.com" + rhos_release: + extra_args: + - "-p" + - "{{ !lookup product.repo.release }}" + +node: + prefix: + - "{{ !lookup product.repo.short_type }}" diff --git a/settings/product/rhos/repo/poodle.yml b/settings/product/rhos/repo/poodle.yml new file mode 100644 index 0000000000..83adea54c7 --- /dev/null +++ b/settings/product/rhos/repo/poodle.yml @@ -0,0 +1,9 @@ +--- !extends:common/common.yml + +product: + repo: + type: poodle + short_type: pod + rhos_release: + extra_args: + - "-d" diff --git a/settings/product/rhos/repo/puddle.yml b/settings/product/rhos/repo/puddle.yml new file mode 100644 index 0000000000..6ac8122ae7 --- /dev/null +++ b/settings/product/rhos/repo/puddle.yml @@ -0,0 +1,6 @@ +--- !extends:common/common.yml + +product: + repo: + type: puddle + short_type: pud diff --git a/settings/product/rhos/version/7.0.yml b/settings/product/rhos/version/7.0.yml new file mode 100644 index 0000000000..7975b4a060 --- /dev/null +++ b/settings/product/rhos/version/7.0.yml @@ -0,0 +1,9 @@ +--- + +product: + build: latest + full_version: "7.0" + version: + major: 7 + minor: 0 + code_name: kilo diff --git a/settings/product/rhos/version/8.0.yml b/settings/product/rhos/version/8.0.yml new file mode 100644 index 0000000000..a2450152d1 --- /dev/null +++ b/settings/product/rhos/version/8.0.yml @@ -0,0 +1,13 @@ +--- + +product: + build: latest + full_version: "8.0" + version: + major: 8 + minor: 0 + code_name: liberty + +workarounds: + rhbz1300662: {} + rhbz1299563: {} From f82839d60b4522a6dba0b03f0548e67a80fbee66 Mon Sep 17 00:00:00 2001 From: Yair Fried Date: Mon, 29 Feb 2016 17:58:57 +0200 Subject: [PATCH 5/5] Replace wget with ansible get_url module --- roles/ospd/overcloud/images/import/tasks/main.yml | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/roles/ospd/overcloud/images/import/tasks/main.yml b/roles/ospd/overcloud/images/import/tasks/main.yml index 39474843ef..1a13b2625d 100644 --- a/roles/ospd/overcloud/images/import/tasks/main.yml +++ b/roles/ospd/overcloud/images/import/tasks/main.yml @@ -1,13 +1,8 @@ --- -- name: ensure wget is installed - yum: - name: wget - state: latest - - name: download the pre-built overcloud images - shell: > - wget --quiet -c -O ~/{{ item.value }} - "{{ installer.images.base_url }}/{{ item.value }}" + get_url: + dest: "~/{{ item.value }}" + url: "{{ installer.images.base_url }}/{{ item.value }}" with_dict: "{{ installer.images.overcloud.files }}" - name: untar the images