Skip to content

Commit

Permalink
Deprecate Ubuntu 14.04
Browse files Browse the repository at this point in the history
PNDA-4525
  • Loading branch information
jeclarke committed Apr 18, 2018
1 parent 58bce1d commit 4283043
Show file tree
Hide file tree
Showing 29 changed files with 85 additions and 344 deletions.
1 change: 0 additions & 1 deletion SUMMARY.md
Expand Up @@ -32,7 +32,6 @@
* [Create PNDA cluster](provisioning/server-cluster/CREATE.md)
* [Creating PNDA on Bare metal](provisioning/baremetal/PREPARE.md)
* [Setting up Undercloud](provisioning/baremetal/UNDERCLOUD.md)
* [Setting up Saltmaster VM](provisioning/baremetal/SALTMASTER.md)
* [Registering nodes with Undercloud](provisioning/baremetal/REGISTER.md)
* [Create PNDA mirror components](provisioning/baremetal/MIRROR.md)
* [Create PNDA build components](provisioning/baremetal/BUILD.md)
Expand Down
2 changes: 1 addition & 1 deletion console/uicredentials.md
Expand Up @@ -26,7 +26,7 @@ If different passwords are required they can be configured in the platform-salt
- The PNDA user credentials are located in [platform-salt/pillar/pnda.sls:pnda](https://github.com/pndaproject/platform-salt/blob/develop/pillar/pnda.sls)
- The Jupyter user credentials (when using the default pam_module: 'pam_unix' authentication) are located in [platform-salt/pillar/identity.sls](https://github.com/pndaproject/platform-salt/blob/develop/pillar/identity.sls)

Note that for the PNDA user `password_hash` should be set along with the `user` and `password`. The easiest and most reliable way to do this is to set the password on an Ubuntu 14.04 machine, then look in /etc/shadow for the password hash.
Note that for the PNDA user `password_hash` should be set along with the `user` and `password`. The easiest and most reliable way to do this is to set the password on a RHEL 7 machine, then look in /etc/shadow for the password hash.

The credentials can also be changed manually in each UI as required after PNDA has been provisioned.

Expand Down
1 change: 0 additions & 1 deletion others/README.md
Expand Up @@ -47,7 +47,6 @@
* [SSH Public Key](https://git-scm.com/book/be/v2/Git-on-the-Server-Generating-Your-SSH-Public-Key)
* [Strict versioning](http://legacy.python.org/dev/peps/pep-0386)
* [TripleO](http://docs.openstack.org/developer/tripleo-docs/)
* [Ubuntu](http://www.ubuntu.com)
* [YARN](http://hadoop.apache.org/docs/current/hadoop-yarn/hadoop-yarn-site/YARN.html)
* [Zookeeper](http://zookeeper.apache.org/)

2 changes: 1 addition & 1 deletion provisioning/aws/BUILD.md
Expand Up @@ -15,7 +15,7 @@ Designate or create the PNDA build node. This could be the same machine that was
Two types of build node are supported -

- Red Hat Enterprise Linux 7
- Ubuntu 14.04
- CentOS 7


#### Obtain build tools
Expand Down
10 changes: 5 additions & 5 deletions provisioning/aws/CONFIGURE.md
Expand Up @@ -12,7 +12,7 @@ A template YAML configuration can be found in the [pnda-cli repository](https://

#### Designate client machine

Create or designate a suitable machine for running the PNDA CLI. We recommend Ubuntu 14.04.
Create or designate a suitable machine for running the PNDA CLI. We recommend CentOS 7.

#### Obtain code

Expand All @@ -24,10 +24,10 @@ Copy ```pnda_env_example.yaml``` to create ```pnda_env.yaml```

Set the following image related fields as below.

| Field | Ubuntu | RHEL | CentOS |
| --- | --- | --- | --- |
| `cloud_formation_parameters.imageId` | Select 64 bit Ubunutu 14.04 image for region | Select 64 bit RHEL 7 image for region | Select 64 bit CentOS 7 image for region |
| `ec2_access.OS_USER` | ubuntu | ec2-user | centos |
| Field | RHEL | CentOS |
| --- | --- | --- |
| `cloud_formation_parameters.imageId` | Select 64 bit RHEL 7 image for region | Select 64 bit CentOS 7 image for region |
| `ec2_access.OS_USER` | ec2-user | centos |

#### Set ec2 access keys

Expand Down
24 changes: 11 additions & 13 deletions provisioning/aws/EXAMPLES.md
Expand Up @@ -4,17 +4,17 @@ These are some examples of how an HTTP server can be set up to serve files for P

These notes are intended for guidance only and will not be maintained or supported. You are strongly advised to refer to the official documentation for each technology.

## Apache HTTP Server on Ubuntu
## Apache HTTP Server on CentOS

Assuming a working Ubuntu 14.04 server and that built components are in directory pnda-files below the current working directory -
Assuming a working CentOS 7 server and that built components are in directory pnda-dist below the current working directory -

Install Apache HTTP Server -

sudo apt-get install apache2
sudo yum install httpd

Copy components to the HTTP server -

cp pnda-files/* /var/www/html/
cp pnda-dist/* /var/www/html/

The components are now available via HTTP from the server -

Expand Down Expand Up @@ -52,18 +52,17 @@ Create a Vagrantfile, substituting in your AWS configuration -
aws.ami = "<YOUR CONFIG>"
aws.region = "<YOUR CONFIG>"
aws.security_groups = [ '<YOUR CONFIG>' ]
override.ssh.username = "ubuntu"
override.ssh.username = "centos"
override.ssh.private_key_path = "<YOUR CONFIG>"
end
config.vm.provision :shell, path: "bootstrap.sh"
end

Create a bootstrap.sh -

apt-get update
apt-get install -y apache2
yum install -y httpd
rm -rf /var/www/html
ln -fs /vagrant/pnda-files /var/www/html
ln -fs /vagrant/pnda-dist /var/www/html

Start the instance -

Expand Down Expand Up @@ -106,10 +105,9 @@ Create a Vagrantfile, substituting in your OpenStack configuration -

Create a bootstrap.sh -

apt-get update
apt-get install -y apache2
yum install -y httpd
rm -rf /var/www/html
ln -fs /vagrant/pnda-files /var/www/html
ln -fs /vagrant/pnda-dist /var/www/html

Start the instance -

Expand All @@ -130,7 +128,7 @@ Assuming a working Docker installation and that built components are in director
Create a Dockerfile -

FROM httpd:2.4
COPY ./pnda-files/ /usr/local/apache2/htdocs/
COPY ./pnda-dist/ /usr/local/apache2/htdocs/

Build the container -

Expand All @@ -143,6 +141,6 @@ The components are now available via HTTP from the server -

If you need to update the components later -

sudo docker cp pnda-files/some-component-0.2.0.tar.gz package-server:/usr/local/apache2/htdocs/
sudo docker cp pnda-dist/some-component-0.2.0.tar.gz package-server:/usr/local/apache2/htdocs/


10 changes: 3 additions & 7 deletions provisioning/aws/MIRROR.md
Expand Up @@ -8,9 +8,9 @@ As many real-world deployment environments don’t have Internet connectivity an

Before PNDA can be created, first we must create the directory structure and file sets to be placed on the PNDA mirror.

### Ubuntu, RHEL or CentOS
### RHEL or CentOS

PNDA can be created on Ubuntu, RHEL or CentOS instances. Before building the PNDA mirror components, decide which instance type your deployment will use.
PNDA can be created on RHEL or CentOS instances. Before building the PNDA mirror components, decide which instance type your deployment will use.

## Create mirror

Expand All @@ -23,7 +23,7 @@ This can be a physical machine or a VM but it needs to reflect the type of mirro
Two types of mirror are supported -

- Red Hat Enterprise Linux 7
- Ubuntu 14.04
- CentOS 7

If using Red Hat, ensure the mirror is built on a clean instance that has had **absolutely no additional** packages installed via yum (i.e. git, unzip, etc) as this will interfere with the dependency calculations of which RPM packages are required on the mirror.

Expand Down Expand Up @@ -68,7 +68,6 @@ This takes about 20 minutes to run and the output will be available in a directo
The different parts of the mirror can be created separately if required. The scripts to do this are -

```
create_mirror_deb.sh
create_mirror_rpm.sh
create_mirror_misc.sh
create_mirror_python.sh
Expand All @@ -78,12 +77,9 @@ create_mirror_hdp.sh
create_mirror_apps.sh
```

Note that, as above, the deb and rpm scripts are for use on Ubuntu or RHEL/CentOS hosts respectively.

Each script creates its output in a directory named for the respective mirror type -

```
mirror_deb
mirror_rpm
mirror_misc
mirror_python
Expand Down
6 changes: 3 additions & 3 deletions provisioning/aws/STAGE.md
Expand Up @@ -31,14 +31,14 @@ pnda-root
│   ├── Anaconda-4.0.0-el7.parcel
│ ├── etc
├── mirror_deb
│   ├── acl_2.2.52-1_amd64.deb
├── mirror_rpm
│   ├── a-rpm.rpm
│ ├── etc
├── etc
```

Note that ```pnda-root``` can be any location, all that is required is that the hierarchy under this is available via a known URI. For example, using a standard Apache 2 installation on Ubuntu 14.04, if the hierarchy above is placed in ```/var/www/html``` this will be available via the URI ```http://<server>/``` since ```/var/www/html``` is the default *document root*. Please refer to your HTTP server documentation for more details.
Note that ```pnda-root``` can be any location, all that is required is that the hierarchy under this is available via a known URI. For example, using a standard Apache 2 installation on RHEL 7, if the hierarchy above is placed in ```/var/www/html``` this will be available via the URI ```http://<server>/``` since ```/var/www/html``` is the default *document root*. Please refer to your HTTP server documentation for more details.

Make a note of the URI to ```pnda-root``` as this will be used in configuring the PNDA creation process.

Expand Down
2 changes: 1 addition & 1 deletion provisioning/baremetal/BUILD.md
Expand Up @@ -15,7 +15,7 @@ Designate or create the PNDA build machine. This could be the same machine that
Two types of build node are supported -

- Red Hat Enterprise Linux 7
- Ubuntu 14.04
- CentOS 7


#### Obtain build tools
Expand Down
2 changes: 1 addition & 1 deletion provisioning/baremetal/CONFIGURE.md
Expand Up @@ -12,7 +12,7 @@ A template YAML configuration can be found in the [Heat templates repository](ht

#### Designate client machine

Create or designate a suitable machine for running the PNDA CLI. We recommend Ubuntu 14.04.
Create or designate a suitable machine for running the PNDA CLI. We recommend CentOS 7.

#### Obtain code

Expand Down
7 changes: 4 additions & 3 deletions provisioning/baremetal/CREATE.md
Expand Up @@ -12,11 +12,12 @@ Underneath, Nova will select suitable machines via Ironic based on the earlier f

#### Install CLI dependencies

To use the PNDA command line interface, you will need to install the python, heat and nova clients. To install them on Ubuntu, run:
To use the PNDA command line interface, you will need to install the python, heat and nova clients. To install them on CentOS, run:

```
sudo apt-get -y update
sudo apt-get -y install python python-pip python-dev
sudo yum install -y epel-release
sudo yum install -y python python-pip python-devel
cd cli
sudo pip install -r requirements.txt
sudo pip install jinja2 --upgrade
Expand Down
10 changes: 3 additions & 7 deletions provisioning/baremetal/MIRROR.md
Expand Up @@ -10,9 +10,9 @@ At provisioning time, when Minions execute SaltStack states, software from this

Before PNDA can be created, first we must create the directory structure and file sets to be placed on the PNDA mirror.

### Ubuntu or RHEL
### CentOS or RHEL

PNDA can be created on Ubuntu or RHEL instances. Before building the PNDA mirror components, decide which instance type your deployment will use.
PNDA can be created on CentOS or RHEL instances. Before building the PNDA mirror components, decide which instance type your deployment will use.

## Create mirror

Expand All @@ -25,7 +25,7 @@ This can be a physical machine or a VM but it needs to reflect the type of mirro
Two types of mirror are supported -

- Red Hat Enterprise Linux 7
- Ubuntu 14.04
- CentOS 7

#### Obtain mirror build tools

Expand All @@ -51,7 +51,6 @@ This takes about 20 minutes to run and the output will be available in a directo
The different parts of the mirror can be created separately if required. The scripts to do this are -

```
create_mirror_deb.sh
create_mirror_rpm.sh
create_mirror_misc.sh
create_mirror_python.sh
Expand All @@ -60,12 +59,9 @@ create_mirror_cdh.sh
create_mirror_hdp.sh
```

Note that, as above, the deb and rpm scripts are for use on Ubuntu or RHEL hosts respectively.

Each script creates its output in a directory named for the respective mirror type -

```
mirror_deb
mirror_rpm
mirror_misc
mirror_python
Expand Down
2 changes: 1 addition & 1 deletion provisioning/baremetal/PREPARE.md
Expand Up @@ -41,7 +41,7 @@ It will have two network interfaces. One will be dedicated to provisioning and a

![](bm-deployment.png)

The build node operating system must be either a Centos 7 or Redhat Enterprise Linux 7.
The build node operating system must be either a CentOS 7 or Redhat Enterprise Linux 7.

On the build node, a number of additional nodes will be created, as KVMs.

Expand Down
6 changes: 3 additions & 3 deletions provisioning/baremetal/STAGE.md
Expand Up @@ -117,14 +117,14 @@ pnda-root
│   ├── Anaconda-4.0.0-el7.parcel
│ ├── etc
├── mirror_deb
│   ├── acl_2.2.52-1_amd64.deb
├── mirror_rpm
│   ├── a-rpm.rpm
│ ├── etc
├── etc
```

Note that ```pnda-root``` can be any location, all that is required is that the hierarchy under this is available via a known URI. For example, using a standard Apache 2 installation on Ubuntu 14.04, if the hierarchy above is placed in ```/var/www/html``` this will be available via the URI ```http://<server>/``` since ```/var/www/html``` is the default *document root*. Please refer to your HTTP server documentation for more details.
Note that ```pnda-root``` can be any location, all that is required is that the hierarchy under this is available via a known URI. For example, using a standard Apache 2 installation on RHEL, if the hierarchy above is placed in ```/var/www/html``` this will be available via the URI ```http://<server>/``` since ```/var/www/html``` is the default *document root*. Please refer to your HTTP server documentation for more details.

Make a note of the URI to ```pnda-root``` as this will be used in configuring the PNDA creation process.

Expand Down
2 changes: 1 addition & 1 deletion provisioning/baremetal/UNDERCLOUD.md
Expand Up @@ -73,7 +73,7 @@ sudo cp CentOS-7-x86_64-GenericCloud.qcow2 /var/lib/libvirt/images/undercloud.qc

#### Resize the undercloud disk

The generic Centos image does not have sufficient disk space. Resize it now.
The generic CentOS image does not have sufficient disk space. Resize it now.

```
sudo qemu-img resize /var/lib/libvirt/images/undercloud.qcow2 +120G
Expand Down
2 changes: 1 addition & 1 deletion provisioning/openstack/BUILD.md
Expand Up @@ -15,7 +15,7 @@ Designate or create the PNDA build node. This could be the same machine that was
Two types of build node are supported -

- Red Hat Enterprise Linux 7
- Ubuntu 14.04
- CentOS 7


#### Obtain build tools
Expand Down
2 changes: 1 addition & 1 deletion provisioning/openstack/CONFIGURE.md
Expand Up @@ -12,7 +12,7 @@ A template YAML configuration can be found in the [Heat templates repository](ht

#### Designate client machine

Create or designate a suitable machine for running the PNDA CLI. We recommend Ubuntu 14.04.
Create or designate a suitable machine for running the PNDA CLI. We recommend CentOS 7.

#### Obtain code

Expand Down
8 changes: 5 additions & 3 deletions provisioning/openstack/CREATE.md
Expand Up @@ -10,13 +10,15 @@ With the target platform fully prepared, the PNDA software staged and the YAML c

#### Install CLI dependencies

To use the PNDA command line interface, you will need to install the python, heat and nova clients. To install them on Ubuntu, run:
To use the PNDA command line interface, you will need to install the python, heat and nova clients. To install them on CentOS, run:

```
sudo apt-get -y update
sudo apt-get -y install python python-pip python-dev
sudo yum install -y epel-release
sudo yum install -y python python-pip python-devel
cd cli
sudo pip install -r requirements.txt
sudo pip install jinja2 --upgrade
```
#### Keystone authentication

Expand Down

0 comments on commit 4283043

Please sign in to comment.