Adds yaml files to use as input to Apex build/deploy 97/3897/1
authorTim Rozet <trozet@redhat.com>
Wed, 2 Dec 2015 22:32:52 +0000 (17:32 -0500)
committerTim Rozet <trozet@redhat.com>
Wed, 2 Dec 2015 22:34:21 +0000 (17:34 -0500)
yaml inputs are broken up into:
-build settings
-deploy options
-network definition
-pod baremetal information

JIRA: APEX-53

Change-Id: Iee85b17beb37ce82bf9312dcce61e09ae924dfc5
Signed-off-by: Tim Rozet <trozet@redhat.com>
config/build/build_settings.yaml [new file with mode: 0644]
config/deploy/deploy_settings.yaml [new file with mode: 0644]
config/deploy/network/network-environment-example.yaml [new file with mode: 0644]
config/inventory/pod_example_settings.yaml [new file with mode: 0644]

diff --git a/config/build/build_settings.yaml b/config/build/build_settings.yaml
new file mode 100644 (file)
index 0000000..93ac944
--- /dev/null
@@ -0,0 +1,26 @@
+build_params:
+  opendaylight: true
+  onos: false
+  ovs: true
+  odl_puppet: true
+
+opendaylight_config:
+  name: "OpenDaylight SFC"
+  method: zip
+  location: https://www.dropbox.com/s/6w76eo7loltvvb5/openstack.net-virt-sfc-karaf-1.2.1-SNAPSHOT.zip
+
+onos_config:
+  name: "ONOS Base Controller"
+  method: rpm
+  location: https://www.example.com/onos.rpm
+
+ovs_config:
+  name: "OVS NSH Build"
+  method: rpm
+  location: https://www.example.com/ovs_nsh_noarch.rpm
+
+odl_puppet_config:
+  name: "Puppet to install ODL SFC"
+  method: git
+  location: https://github.com/puppet-opendaylight.git
+  version: "stable/liberty"
diff --git a/config/deploy/deploy_settings.yaml b/config/deploy/deploy_settings.yaml
new file mode 100644 (file)
index 0000000..f024116
--- /dev/null
@@ -0,0 +1,11 @@
+global_params:
+  ha_enabled: true
+  network_isolation_settings: network/network-environment-example.yaml
+
+deploy_options:
+  sdn_controller: opendaylight
+  tacker: false
+  congress: false
+
+
+  
diff --git a/config/deploy/network/network-environment-example.yaml b/config/deploy/network/network-environment-example.yaml
new file mode 100644 (file)
index 0000000..f6c101f
--- /dev/null
@@ -0,0 +1,71 @@
+resource_registry:
+  OS::TripleO::BlockStorage::Net::SoftwareConfig: /home/stack/nic-configs/cinder-storage.yaml
+  OS::TripleO::Compute::Net::SoftwareConfig: /home/stack/nic-configs/compute.yaml
+  OS::TripleO::Controller::Net::SoftwareConfig: /home/stack/nic-configs/controller.yaml
+  OS::TripleO::ObjectStorage::Net::SoftwareConfig: /home/stack/nic-configs/swift-storage.yaml
+  OS::TripleO::CephStorage::Net::SoftwareConfig: /home/stack/nic-configs/ceph-storage.yaml
+
+parameter_defaults:
+  # Customize all these values to match the local environment
+  InternalApiNetCidr: 172.17.0.0/24
+  StorageNetCidr: 172.18.0.0/24
+  StorageMgmtNetCidr: 172.19.0.0/24
+  TenantNetCidr: 172.16.0.0/24
+  ExternalNetCidr: 10.1.2.0/24
+  # CIDR subnet mask length for provisioning network
+  ControlPlaneSubnetCidr: 24
+  InternalApiAllocationPools: [{'start': '172.17.0.10', 'end': '172.17.0.200'}]
+  StorageAllocationPools: [{'start': '172.18.0.10', 'end': '172.18.0.200'}]
+  StorageMgmtAllocationPools: [{'start': '172.19.0.10', 'end': '172.19.0.200'}]
+  TenantAllocationPools: [{'start': '172.16.0.10', 'end': '172.16.0.200'}]
+  # Use an External allocation pool which will leave room for floating IPs
+  ExternalAllocationPools: [{'start': '10.1.2.10', 'end': '10.1.2.50'}]
+  # Set to the router gateway on the external network
+  ExternalInterfaceDefaultRoute: 10.1.2.1
+  # Gateway router for the provisioning network (or Undercloud IP)
+  ControlPlaneDefaultRoute: 192.0.2.254
+  # Generally the IP of the Undercloud
+  EC2MetadataIp: 192.0.2.1
+  # Define the DNS servers (maximum 2) for the overcloud nodes
+  DnsServers: ["8.8.8.8","8.8.4.4"]
+  InternalApiNetworkVlanID: 201
+  StorageNetworkVlanID: 202
+  StorageMgmtNetworkVlanID: 203
+  TenantNetworkVlanID: 204
+  ExternalNetworkVlanID: 100
+  # May set to br-ex if using floating IPs only on native VLAN on bridge br-ex
+  NeutronExternalNetworkBridge: "''"
+  # Customize bonding options if required (ignored if bonds are not used)
+  BondInterfaceOvsOptions:
+      "bond_mode=balance-tcp lacp=active other-config:lacp-fallback-ab=true"
+
+  ServiceNetMap:
+    NeutronTenantNetwork: tenant
+    CeilometerApiNetwork: internal_api
+    MongoDbNetwork: internal_api
+    CinderApiNetwork: internal_api
+    CinderIscsiNetwork: storage
+    GlanceApiNetwork: storage
+    GlanceRegistryNetwork: internal_api
+    KeystoneAdminApiNetwork: internal_api
+    KeystonePublicApiNetwork: internal_api
+    NeutronApiNetwork: internal_api
+    HeatApiNetwork: internal_api
+    NovaApiNetwork: internal_api
+    NovaMetadataNetwork: internal_api
+    NovaVncProxyNetwork: internal_api
+    SwiftMgmtNetwork: storage_mgmt
+    SwiftProxyNetwork: storage
+    HorizonNetwork: internal_api
+    MemcachedNetwork: internal_api
+    RabbitMqNetwork: internal_api
+    RedisNetwork: internal_api
+    MysqlNetwork: internal_api
+    CephClusterNetwork: storage_mgmt
+    CephPublicNetwork: storage
+    # Define which network will be used for hostname resolution
+    ControllerHostnameResolveNetwork: internal_api
+    ComputeHostnameResolveNetwork: internal_api
+    BlockStorageHostnameResolveNetwork: internal_api
+    ObjectStorageHostnameResolveNetwork: internal_api
+    CephStorageHostnameResolveNetwork: storage
diff --git a/config/inventory/pod_example_settings.yaml b/config/inventory/pod_example_settings.yaml
new file mode 100644 (file)
index 0000000..f24b8e1
--- /dev/null
@@ -0,0 +1,46 @@
+nodes:
+  node1:
+    mac_address: "10:23:45:67:89:AB"
+    ipmi_ip: 10.4.17.2
+    ipmi_user: root
+    ipmi_pass: root
+    cpus: 2
+    memory: 2048
+    disk: 40
+    arch: "x86_64"
+  node2:
+    mac_address: "10:23:45:67:89:AC"
+    ipmi_ip: 10.4.17.3
+    ipmi_user: root
+    ipmi_pass: root
+    cpus: 2
+    memory: 2048
+    disk: 40
+    arch: "x86_64"
+  node3:
+    mac_address: "10:23:45:67:89:AD"
+    ipmi_ip: 10.4.17.4
+    ipmi_user: root
+    ipmi_pass: root
+    cpus: 2
+    memory: 2048
+    disk: 40
+    arch: "x86_64"
+  node4:
+    mac_address: "10:23:45:67:89:AE"
+    ipmi_ip: 10.4.17.5
+    ipmi_user: root
+    ipmi_pass: root
+    cpus: 2
+    memory: 2048
+    disk: 40
+    arch: "x86_64"
+  node5:
+    mac_address: "10:23:45:67:89:AF"
+    ipmi_ip: 10.4.17.6
+    ipmi_user: root
+    ipmi_pass: root
+    cpus: 2
+    memory: 2048
+    disk: 40
+    arch: "x86_64"