summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xci/02-maasdeploy.sh10
-rwxr-xr-xci/clean.sh6
-rw-r--r--ci/maas/default/deployment.yaml155
-rwxr-xr-xci/maas/orange/pod2/deployment.yaml262
-rw-r--r--labconfig/orange/pod2/labconfig.yaml88
5 files changed, 62 insertions, 459 deletions
diff --git a/ci/02-maasdeploy.sh b/ci/02-maasdeploy.sh
index ca765399..f13e63f5 100755
--- a/ci/02-maasdeploy.sh
+++ b/ci/02-maasdeploy.sh
@@ -59,10 +59,14 @@ else
python deploy.py
;;
'orangepod1' )
- cp maas/orange/pod1/deployment.yaml ./deployment.yaml
+ cp ../labconfig/orange/pod1/labconfig.yaml ./
+ #to be removed later once converted for all labs.
+ python deploy.py
;;
'orangepod2' )
- cp maas/orange/pod2/deployment.yaml ./deployment.yaml
+ cp ../labconfig/orange/pod1/labconfig.yaml ./
+ #to be removed later once converted for all labs.
+ python deploy.py
;;
'attvirpod1' )
cp maas/att/virpod1/deployment.yaml ./deployment.yaml
@@ -75,7 +79,7 @@ else
;;
* )
virtinstall=1
- labname = "default"
+ labname="default"
./cleanvm.sh
cp ../labconfig/default/deployment.yaml ./
;;
diff --git a/ci/clean.sh b/ci/clean.sh
index c6658b4e..adf225c4 100755
--- a/ci/clean.sh
+++ b/ci/clean.sh
@@ -10,9 +10,11 @@ if [ -d $HOME/.juju/environments ]; then
else
echo " environment is bootstrapped ..."
juju destroy-environment demo-maas -y
- rm -rf $HOME/.juju/j*
- rm -rf $HOME/.juju/.deployer-store-cache
fi
+ rm -rf trusty
+ rm -rf xenial
+ rm -rf $HOME/.juju/j*
+ rm -rf $HOME/.juju/.deployer-store-cache
rm -rf $HOME/.juju/environments
rm -rf $HOME/.juju/ssh
fi
diff --git a/ci/maas/default/deployment.yaml b/ci/maas/default/deployment.yaml
deleted file mode 100644
index 857237aa..00000000
--- a/ci/maas/default/deployment.yaml
+++ /dev/null
@@ -1,155 +0,0 @@
-# This file defines the deployment for the MAAS environment which is to be
-# deployed and automated.
-demo-maas:
- # Contains the virtual machine parameters for creating the Juju bootstrap
- # node virtual machine
- juju-bootstrap:
- name: bootstrap
- interfaces: ['bridge=virbr0,model=virtio']
- memory: 2048
- vcpus: 2
- arch: amd64
- pool: default
- disk_size: 20G
-# sticky_ip_address:
-# requested_address: 192.168.122.25
-
- maas:
- # Defines the general setup for the MAAS environment, including the
- # username and password for the host as well as the MAAS server.
- user: ubuntu
- password: ubuntu
-
- # Contains the virtual machine parameters for creating the MAAS virtual
- # server. Here you can configure the name of the virsh domain, the
- # parameters for how the network is attached.
- name: opnfv-maas
- interfaces: ['bridge=virbr0,model=virtio']
- memory: 4096
- vcpus: 2
- arch: amd64
- pool: default
- disk_size: 60G
- release: trusty
-
- # Apt http proxy setting(s)
- apt_http_proxy:
-
- apt_sources:
- - ppa:maas/stable
- - ppa:juju/stable
-
- boot_source:
- url: http://maas.ubuntu.com/images/ephemeral-v2/daily/
- keyring_filename: /usr/share/keyrings/ubuntu-cloudimage-keyring.gpg
- exclusive: true
- selections:
- 1:
- release: trusty
- os: ubuntu
- arches: amd64
- subarches: "*"
- labels: daily
- 2:
- release: xenial
- os: ubuntu
- arches: amd64
- subarches: "*"
- labels: daily
-
- # Virsh power settings
- # Specifies the uri and keys to use for virsh power control of the
- # juju virtual machine. If the uri is omitted, the value for the
- # --remote is used. If no power settings are desired, then do not
- # supply the virsh block.
- virsh:
- rsa_priv_key: /home/ubuntu/.ssh/id_rsa
- rsa_pub_key: /home/ubuntu/.ssh/id_rsa.pub
- uri: qemu+ssh://ubuntu@192.168.122.1/system
-
- # Defines the IP Address that the configuration script will use to
- # to access the MAAS controller via SSH.
- ip_address: 192.168.122.2
-
- # This section allows the user to set a series of options on the
- # MAAS server itself. The list of config options can be found in
- # the upstream MAAS documentation:
- # - http://maas.ubuntu.com/docs/api.html#maas-server
- settings:
- main_archive: http://us.archive.ubuntu.com/ubuntu
- upstream_dns: 192.168.122.1
- maas_name: automaas
- # kernel_opts: "console=tty0 console=ttyS1,115200n8"
- ntp_server: ntp.ubuntu.com
-
- # This section is used to define the networking parameters for when
- # the node first comes up. It is fed into the meta-data cloud-init
- # configuration and is used to configure the networking piece of the
- # service. The contents of this section are written directly to the
- # /etc/network/interfaces file.
- #
- # Please note, this is slightly different than the
- # node-group-interfaces section below. This will configure the
- # machine's networking params, and the node-group-interfaces will
- # configure the maas node-group interfaces which is used for
- # controlling the dhcp, dns, etc.
- network_config: |
- auto lo
- iface lo inet loopback
-
- auto eth0
- iface eth0 inet static
- address 192.168.122.2
- netmask 255.255.255.0
- network 192.168.122.0
- broadcast 192.168.122.255
- gateway 192.168.122.1
- dns-nameservers 192.168.122.1 127.0.0.1
-
- # See https://maas.ubuntu.com/docs/maascli.html#node-groups for
- # description and full list of supported options.
- # NOTE: interfaces are added using the node_group_interfaces section
- # and only one node_group can be created by this bundle.
- # Additional node groups can be added post deployment.
- #node_group:
- # # This is the cluster DNS name.
- # name: maas
-
- # The node-group-interfaces section is used to configure the MAAS
- # network interfaces. Basic configuration is supported, such as which
- # device should be bound, the range of IP addresses, etc.
- # Note: this may contain the special identifiers:
- # ${maas_net} - the first 3 octets of the ipv4 address
- # ${maas_ip} - the ip address of the MAAS controller
- node_group_ifaces:
- - device: eth0
- ip: 192.168.122.2
- subnet_mask: 255.255.255.0
- broadcast_ip: 192.168.122.255
- router_ip: 192.168.122.1
- static_range:
- low: 192.168.122.101
- high: 192.168.122.200
- dynamic_range:
- low: 192.168.122.25
- high: 192.168.122.100
-
- # Physical nodes to be added to the MAAS cluster. Nodes will be
- # configured, commissioned and put into the Ready state so
- # they are ready to be deployed to.
- #nodes:
- # - name: node1
- # tags: api
- # architecture: amd64/generic
- # mac_addresses:
- # - "38:63:bb:43:b8:9c"
- # power:
- # type: ipmi
- # address: 10.0.1.1
- # user: maas
- # pass: passw0rd
- # driver: LAN_2_0
- # sticky_ip_address:
- # mac_address: "38:63:bb:43:b8:9c"
- # requested_address: 192.168.122.6
-
diff --git a/ci/maas/orange/pod2/deployment.yaml b/ci/maas/orange/pod2/deployment.yaml
deleted file mode 100755
index a5968ab9..00000000
--- a/ci/maas/orange/pod2/deployment.yaml
+++ /dev/null
@@ -1,262 +0,0 @@
-# This file defines the deployment for the MAAS environment which is to be
-# deployed and automated.
-demo-maas:
- maas:
- # Defines the general setup for the MAAS environment, including the
- # username and password for the host as well as the MAAS server.
- user: ubuntu
- password: ubuntu
-
- # Contains the virtual machine parameters for creating the MAAS virtual
- # server. Here you can configure the name of the virsh domain, the
- # parameters for how the network is attached.
- name: opnfv-maas-orange
- interfaces: ['bridge=brAdm,model=virtio', 'bridge=brData,model=virtio', 'bridge=brStorage,model=virtio']
- memory: 4096
- vcpus: 4
- arch: amd64
- pool: default
- disk_size: 120G
- release: trusty
-
- # Apt http proxy setting(s)
- apt_http_proxy:
-
- apt_sources:
- - ppa:maas/stable
- - ppa:juju/stable
-
- boot_source:
- url: http://maas.ubuntu.com/images/ephemeral-v2/daily/
- keyring_filename: /usr/share/keyrings/ubuntu-cloudimage-keyring.gpg
- exclusive: true
- selections:
- 1:
- release: trusty
- os: ubuntu
- arches: amd64
- subarches: "*"
- labels: daily
- 2:
- release: xenial
- os: ubuntu
- arches: amd64
- subarches: "*"
- labels: daily
-
- # Virsh power settings
- # Specifies the uri and keys to use for virsh power control of the
- # juju virtual machine. If the uri is omitted, the value for the
- # --remote is used. If no power settings are desired, then do not
- # supply the virsh block.
- virsh:
- rsa_priv_key: /home/ubuntu/.ssh/id_rsa
- rsa_pub_key: /home/ubuntu/.ssh/id_rsa.pub
- uri: qemu+ssh://ubuntu@192.168.2.4/system
-
- # Defines the IP Address that the configuration script will use to
- # to access the MAAS controller via SSH.
- ip_address: 192.168.2.5
-
- # This section allows the user to set a series of options on the
- # MAAS server itself. The list of config options can be found in
- # the upstream MAAS documentation:
- # - http://maas.ubuntu.com/docs/api.html#maas-server
- settings:
- main_archive: http://fr.archive.ubuntu.com/ubuntu
- upstream_dns: 192.168.2.1
- maas_name: orangepod2
- # kernel_opts: "console=tty0 console=ttyS1,115200n8"
- # ntp_server: ntp.ubuntu.com
-
- # This section is used to define the networking parameters for when
- # the node first comes up. It is fed into the meta-data cloud-init
- # configuration and is used to configure the networking piece of the
- # service. The contents of this section are written directly to the
- # /etc/network/interfaces file.
- #
- # Please note, this is slightly different than the
- # node-group-interfaces section below. This will configure the
- # machine's networking params, and the node-group-interfaces will
- # configure the maas node-group interfaces which is used for
- # controlling the dhcp, dns, etc.
- network_config: |
- auto lo
- iface lo inet loopback
-
- auto eth0
- iface eth0 inet static
- address 192.168.2.5
- netmask 255.255.255.0
- network 192.168.2.0
- broadcast 192.168.2.255
- gateway 192.168.2.1
- dns-nameservers 192.168.2.1 127.0.0.1
-
- auto eth1
- iface eth1 inet static
- address 192.168.12.5
- netmask 255.255.255.0
- network 192.168.12.0
- broadcast 192.168.12.255
-
- auto eth2
- iface eth2 inet static
- address 192.168.22.5
- netmask 255.255.255.0
- network 192.168.22.0
- broadcast 192.168.22.255
-
- #auto lo
- #iface lo inet loopback
-
- #auto eth0
- #iface eth0 inet static
- # address 192.168.122.2
- # netmask 255.255.248.0
- # network 192.168.122.0
- # broadcast 192.168.122.255
- # gateway 192.168.122.1
- # dns-nameservers 192.168.122.1 127.0.0.1
-
- # The node-group-interfaces section is used to configure the MAAS
- # network interfaces. Basic configuration is supported, such as which
- # device should be bound, the range of IP addresses, etc.
- # Note: this may contain the special identifiers:
- # ${maas_net} - the first 3 octets of the ipv4 address
- # ${maas_ip} - the ip address of the MAAS controller
- node_group_ifaces:
- - device: eth0
- ip: 192.168.2.5
- subnet_mask: 255.255.255.0
- broadcast_ip: 192.168.2.255
- router_ip: 192.168.2.1
- static_range:
- low: 192.168.2.50
- high: 192.168.2.80
- dynamic_range:
- low: 192.168.2.81
- high: 192.168.2.254
- - device: eth1
- ip: 192.168.12.5
- subnet_mask: 255.255.255.0
- broadcast_ip: 192.168.12.255
- management: 1
- static_range:
- low: 192.168.12.50
- high: 192.168.12.80
- dynamic_range:
- low: 192.168.12.81
- high: 192.168.12.254
- - device: eth2
- ip: 192.168.22.5
- subnet_mask: 255.255.255.0
- broadcast_ip: 192.168.22.255
- management: 1
- static_range:
- low: 192.168.22.50
- high: 192.168.22.80
- dynamic_range:
- low: 192.168.22.81
- high: 192.168.22.254
-
- # Defines the physical nodes which are added to the MAAS cluster
- # controller upon startup of the node.
- nodes:
- - name: node1-compute
- tags: compute
- architecture: amd64/generic
- mac_addresses:
- - "38:63:bb:3f:bc:c8"
- power:
- type: ipmi
- address: 192.168.2.11
- user: Administrator
- pass: pod2Admin
- driver: LAN_2_0
-# sticky_ip_address:
-# mac_address: "38:63:bb:43:b8:9c"
-# requested_address: 192.168.122.5
-#
- - name: node2-compute
- tags: compute
- architecture: amd64/generic
- mac_addresses:
- - "38:63:bb:44:34:84"
- power:
- type: ipmi
- address: 192.168.2.12
- user: Administrator
- pass: pod2Admin
- driver: LAN_2_0
-
- - name: node3-compute
- tags: compute
- architecture: amd64/generic
- mac_addresses:
- - "38:63:bb:3f:1d:8c"
- power:
- type: ipmi
- address: 192.168.2.13
- user: Administrator
- pass: pod2Admin
- driver: LAN_2_0
-
- - name: node4-compute
- tags: compute
- architecture: amd64/generic
- mac_addresses:
- - "38:63:bb:3f:2d:a8"
- power:
- type: ipmi
- address: 192.168.2.14
- user: Administrator
- pass: pod2Admin
- driver: LAN_2_0
-
- - name: node5-control
- tags: control
- architecture: amd64/generic
- mac_addresses:
- - "94:57:a5:52:c9:48"
- power:
- type: ipmi
- address: 192.168.2.15
- user: Administrator
- pass: pod2Admin
- driver: LAN_2_0
-
- - name: node6-control
- tags: control
- architecture: amd64/generic
- mac_addresses:
- - "94:57:a5:52:63:b0"
- power:
- type: ipmi
- address: 192.168.2.16
- user: Administrator
- pass: pod2Admin
- driver: LAN_2_0
-
- - name: node7-control
- tags: control
- architecture: amd64/generic
- mac_addresses:
- - "94:57:a5:52:f1:80"
- power:
- type: ipmi
- address: 192.168.2.17
- user: Administrator
- pass: pod2Admin
- driver: LAN_2_0
-
- # Contains the virtual machine parameters for creating the Juju bootstrap
- # node virtual machine
- juju-bootstrap:
- name: bootstrap
- interfaces: ['bridge=brAdm,model=virtio']
- memory: 8192
- vcpus: 2
- arch: amd64
- pool: default
- disk_size: 60G
diff --git a/labconfig/orange/pod2/labconfig.yaml b/labconfig/orange/pod2/labconfig.yaml
index 8132579a..29d84d14 100644
--- a/labconfig/orange/pod2/labconfig.yaml
+++ b/labconfig/orange/pod2/labconfig.yaml
@@ -1,71 +1,85 @@
labconfig:
- lab_location: intelpod5
+ lab_location: orangepod1
bridges:
- type: admin
bridge: brAdm
- cidr: 10.5.1.0/24
- gateway: 10.5.1.1
+ cidr: 192.168.2.0/24
+ gateway: 192.168.2.1
- type: data
bridge: brData
- cidr: 10.5.12.0/24
+ cidr: 192.168.12.0/24
gateway:
- - type: public
- bridge: brPublic
- cidr: 10.5.15.0/24
- gateway: 10.5.15.254
- - type: external
- bridge: brExt
- cidr:
+ - type: storage
+ bridge: brStorage
+ cidr: 192.168.22.0/24
gateway:
- ipaddress: 10.2.117.92
labsettings:
- upstream_dns: 8.8.8.8
+ upstream_dns: 192.168.2.1
nodes:
- - type: control
+ - type: compute
architecture: x86_64
pxe_mac_address:
- - "00:1e:67:cf:bb:54"
+ - "38:63:bb:3f:bc:c8"
power:
type: ipmi
- address: 10.2.117.81
- user: root
- pass: root
- - type: control
+ address: 192.168.2.11
+ user: Administrator
+ pass: pod2Admin
+ - type: compute
architecture: x86_64
pxe_mac_address:
- - "00:1e:67:cf:b8:93"
+ - "38:63:bb:44:34:84"
power:
type: ipmi
- address: 10.2.117.82
- user: root
- pass: root
- - type: control
+ address: 192.168.2.12
+ user: Administrator
+ pass: po2Admin
+ - type: compute
architecture: x86_64
pxe_mac_address:
- - "00:1e:67:e0:08:7f"
+ - "38:63:bb:3f:1d:8c"
power:
type: ipmi
- address: 10.2.117.83
- user: root
- pass: root
+ address: 192.168.2.13
+ user: Administrator
+ pass: pod2Admin
- type: compute
architecture: x86_64
pxe_mac_address:
- - "00:1e:67:e0:08:b1"
+ - "38:63:bb:3f:2d:a8"
power:
type: ipmi
- address: 10.2.117.84
- user: root
- pass: root
- - type: compute
+ address: 192.168.2.14
+ user: Administrator
+ pass: pod2Admin
+ - type: control
+ architecture: x86_64
+ pxe_mac_address:
+ - "94:57:a5:52:c9:48"
+ power:
+ type: ipmi
+ address: 192.168.2.15
+ user: Administrator
+ pass: pod2Admin
+ - type: control
+ architecture: x86_64
+ pxe_mac_address:
+ - "94:57:a5:52:63:b0"
+ power:
+ type: ipmi
+ address: 192.168.2.16
+ user: Administrator
+ pass: pod2Admin
+ - type: control
architecture: x86_64
pxe_mac_address:
- - "00:1e:67:e0:0a:4b"
+ - "94:57:a5:52:f1:80"
power:
type: ipmi
- address: 10.2.117.85
- user: root
- pass: root
+ address: 192.168.2.17
+ user: Administrator
+ pass: pod2Admin
+
opnfv:
release: c
distro: trusty