diff options
| -rw-r--r-- | common/puppet-opnfv/manifests/controller_networker.pp | 1 | ||||
| -rw-r--r-- | common/puppet-opnfv/manifests/external_net_setup.pp | 8 | ||||
| -rwxr-xr-x | foreman/ci/bootstrap.sh | 2 | ||||
| -rwxr-xr-x | foreman/ci/deploy.sh | 4 | ||||
| -rw-r--r-- | foreman/docs/src/installation-instructions.rst | 7 |
5 files changed, 17 insertions, 5 deletions
diff --git a/common/puppet-opnfv/manifests/controller_networker.pp b/common/puppet-opnfv/manifests/controller_networker.pp index 18a876c..157bc8f 100644 --- a/common/puppet-opnfv/manifests/controller_networker.pp +++ b/common/puppet-opnfv/manifests/controller_networker.pp @@ -106,6 +106,7 @@ class opnfv::controller_networker { if !$lb_backend_server_names { $lb_backend_server_names = $controllers_hostnames_array } if !$neutron_db_password { $neutron_db_password = $single_password } if !$neutron_user_password { $neutron_user_password = $single_password } + if !$neutron_metadata_proxy_secret { $neutron_metadata_proxy_secret = $single_password } if !$nova_db_password { $nova_db_password = $single_password } if !$nova_user_password { $nova_user_password = $single_password } if !$pcmk_server_addrs {$pcmk_server_addrs = $controllers_ip_array} diff --git a/common/puppet-opnfv/manifests/external_net_setup.pp b/common/puppet-opnfv/manifests/external_net_setup.pp index df9bdac..af00f20 100644 --- a/common/puppet-opnfv/manifests/external_net_setup.pp +++ b/common/puppet-opnfv/manifests/external_net_setup.pp @@ -73,5 +73,13 @@ class opnfv::external_net_setup { network_name => 'provider_network', tenant_name => 'admin', } + -> + neutron_router { 'provider_router': + ensure => present, + name => 'provider_router', + admin_state_up => true, + gateway_network_name => 'provider_network', + tenant_name => 'admin', + } } } diff --git a/foreman/ci/bootstrap.sh b/foreman/ci/bootstrap.sh index 839dfaa..4bc22ed 100755 --- a/foreman/ci/bootstrap.sh +++ b/foreman/ci/bootstrap.sh @@ -36,7 +36,7 @@ cd /opt echo "Cloning khaleesi to /opt" if [ ! -d khaleesi ]; then - if ! git clone -b opnfv https://github.com/trozet/khaleesi.git; then + if ! git clone -b v1.0 https://github.com/trozet/khaleesi.git; then printf '%s\n' 'bootstrap.sh: Unable to git clone khaleesi' >&2 exit 1 fi diff --git a/foreman/ci/deploy.sh b/foreman/ci/deploy.sh index 77024c6..86f03a7 100755 --- a/foreman/ci/deploy.sh +++ b/foreman/ci/deploy.sh @@ -277,7 +277,7 @@ rm -rf /tmp/bgs_vagrant ##clone bgs vagrant ##will change this to be opnfv repo when commit is done -if ! git clone https://github.com/trozet/bgs_vagrant.git; then +if ! git clone -b v1.0 https://github.com/trozet/bgs_vagrant.git; then printf '%s\n' 'deploy.sh: Unable to clone vagrant repo' >&2 exit 1 fi @@ -567,7 +567,7 @@ for node in ${nodes}; do ##clone bgs vagrant ##will change this to be opnfv repo when commit is done - if ! git clone https://github.com/trozet/bgs_vagrant.git $node; then + if ! git clone -b v1.0 https://github.com/trozet/bgs_vagrant.git $node; then printf '%s\n' 'deploy.sh: Unable to clone vagrant repo' >&2 exit 1 fi diff --git a/foreman/docs/src/installation-instructions.rst b/foreman/docs/src/installation-instructions.rst index 8f190e3..1315ce7 100644 --- a/foreman/docs/src/installation-instructions.rst +++ b/foreman/docs/src/installation-instructions.rst @@ -34,6 +34,9 @@ Version history | 2015-06-02 | 0.0.3 | Christopher Price | Minor changes & | | | | (Ericsson AB) | formatting | +--------------------+--------------------+--------------------+--------------------+ +| 2015-06-03 | 0.0.4 | Ildiko Vancsa | Minor changes | +| | | (Ericsson) | | ++--------------------+--------------------+--------------------+--------------------+ Introduction @@ -48,7 +51,7 @@ Preface Foreman/QuickStack uses the Foreman Open Source project as a server management tool, which in turn manages and executes Genesis/QuickStack. Genesis/QuickStack consists of layers of Puppet modules that are capable of provisioning the OPNFV Target System (3 controllers, n number of compute nodes). -The Genesis repo contains the necessary tools to get install and deploy an OPNFV target system using Foreman/QuickStack. These tools consist of the Foreman/QuickStack bootable ISO, and the automatic deployment script (``deploy.sh``). +The Genesis repo contains the necessary tools to get install and deploy an OPNFV target system using Foreman/QuickStack. These tools consist of the Foreman/QuickStack bootable ISO (``arno.2015.1.0.foreman.iso``), and the automatic deployment script (``deploy.sh``). An OPNFV install requires a "Jumphost" in order to operate. The bootable ISO will allow you to install a customized CentOS 7 release to the Jumphost, which then gives you the required packages needed to run ``deploy.sh``. If you already have a Jumphost with CentOS 7 installed, you may choose to ignore the ISO step and instead move directly to running ``deploy.sh``. In this case, ``deploy.sh`` will install the necessary packages for you in order to execute. @@ -146,7 +149,7 @@ This section goes step-by-step on how to correctly install and provision the OPN Install Bare Metal Jumphost --------------------------- -1. If your Jumphost does not have CentOS 7 already on it, or you would like to do a fresh install, then download the Foreman/QuickStack bootable ISO here <ISO LINK>. +1. If your Jumphost does not have CentOS 7 already on it, or you would like to do a fresh install, then download the Foreman/QuickStack bootable ISO <http://artifacts.opnfv.org/arno.2015.1.0/foreman/arno.2015.1.0.foreman.iso> here. 2. Boot the ISO off of a USB or other installation media and walk through installing OPNFV CentOS 7. |