diff options
| -rw-r--r-- | fuel/ci/README | 35 | ||||
| -rw-r--r-- | fuel/deploy/README (renamed from fuel/deploy/README.txt) | 12 | ||||
| -rw-r--r-- | fuel/deploy/deploy.py | 2 | ||||
| -rw-r--r-- | fuel/deploy/install_fuel_master.py | 8 | ||||
| -rw-r--r-- | fuel/deploy/templates/hardware_environment/conf/linux_foundation_lab/pod2/dea.yaml | 16 |
5 files changed, 50 insertions, 23 deletions
diff --git a/fuel/ci/README b/fuel/ci/README index f99db99..aab823b 100644 --- a/fuel/ci/README +++ b/fuel/ci/README @@ -47,12 +47,12 @@ optional arguments: - Install Fuel Master and deploy OPNFV Cloud from scratch on Hardware Environment: - sudo ./deploy.sh -iso ~/ISO/opnfv.iso -dea ~/CONF/hardware/dea.yaml -dha ~/CONF/hardware/dha.yaml -s /mnt/images -b pxebr -p ~/PLUGIN + sudo ./deploy.sh -iso ~/ISO/opnfv.iso -dea ~/CONF/hardware/dea.yaml -dha ~/CONF/hardware/dha.yaml -s /mnt/images -b pxebr - Install Fuel Master and deploy OPNFV Cloud from scratch on Virtual Environment: - sudo ./deploy.sh -iso ~/ISO/opnfv.iso -dea ~/CONF/virtual/dea.yaml -dha ~/CONF/virtual/dha.yaml -s /mnt/images -p ~/PLUGIN + sudo ./deploy.sh -iso ~/ISO/opnfv.iso -dea ~/CONF/virtual/dea.yaml -dha ~/CONF/virtual/dha.yaml -s /mnt/images - Deploy OPNFV Cloud on an already active Environment where Fuel Master VM is running so no need to install Fuel again: @@ -60,13 +60,13 @@ optional arguments: sudo ./deploy.sh -nf -dea ~/CONF/virtual/dea.yaml -dha ~/CONF/virtual/dha.yaml => with plugin installation - sudo ./deploy.sh -nf -dea ~/CONF/virtual/dea.yaml -dha ~/CONF/virtual/dha.yaml -p ~/PLUGIN + sudo ./deploy.sh -nf -dea ~/CONF/virtual/dea.yaml -dha ~/CONF/virtual/dha.yaml => with cleanup after deployment is finished - sudo ./deploy.sh -nf -dea ~/CONF/virtual/dea.yaml -dha ~/CONF/virtual/dha.yaml -p ~/PLUGIN -c + sudo ./deploy.sh -nf -dea ~/CONF/virtual/dea.yaml -dha ~/CONF/virtual/dha.yaml -c => no healthcheck after deployment is completed - sudo ./deploy.sh -nf -dea ~/CONF/virtual/dea.yaml -dha ~/CONF/virtual/dha.yaml -p ~/PLUGIN -nh + sudo ./deploy.sh -nf -dea ~/CONF/virtual/dea.yaml -dha ~/CONF/virtual/dha.yaml -nh - Install Fuel Master only (and Node VMs when using virtual environment): @@ -80,4 +80,27 @@ optional arguments: - Cleanup a running OPNFV environment: - sudo ./deploy.sh -co -dha ~/CONF/virtual/dha.yaml
\ No newline at end of file + sudo ./deploy.sh -co -dha ~/CONF/virtual/dha.yaml + + +* WARNINGS: + +=> If optional argument -s <storage_dir> is not specified, Autodeployment will use +"<current_working_dir>/images" as default, and it will create it, if it hasn't been created before + +=> If optional argument -b <pxe_bridge> is not specified, Autodeployment will use "pxebr" as default, +if the bridge does not exist, the application will terminate with an error message + +=> If argument -iso [ISO_FILE] is not specified, Autodeployment will use "<current_working_dir>/OPNFV.iso" +as default, if the iso file does not exist, the application will terminate with an error message + +=> If argument -dea [DEA_FILE] is not specified, Autodeployment will use "<current_working_dir>/dea.yaml" +as default, if DEA file does not exist, the application will terminate with an error message + +=> If argument -dha [DHA_FILE] is not specified, Autodeployment will use "<current_working_dir>/dha.yaml" +as default, if DHA file does not exist, the application will terminate with an error message + +=> Optional argument -b PXE_BRIDGE is not required for Autodeployment in virtual environment, + even if it is specified it will not be used at all because virtual environment is using a different virtual network setup + +=> If optional argument -p FUEL_PLUGINS_DIR is not specified, no external plugins will be installed in Fuel
\ No newline at end of file diff --git a/fuel/deploy/README.txt b/fuel/deploy/README index f42e9ac..167078b 100644 --- a/fuel/deploy/README.txt +++ b/fuel/deploy/README @@ -107,12 +107,12 @@ optional arguments: - Install Fuel Master and deploy OPNFV Cloud from scratch on Hardware Environment: - sudo python deploy.py -iso ~/ISO/opnfv.iso -dea ~/CONF/hardware/dea.yaml -dha ~/CONF/hardware/dha.yaml -s /mnt/images -b pxebr -p ~/PLUGIN + sudo python deploy.py -iso ~/ISO/opnfv.iso -dea ~/CONF/hardware/dea.yaml -dha ~/CONF/hardware/dha.yaml -s /mnt/images -b pxebr - Install Fuel Master and deploy OPNFV Cloud from scratch on Virtual Environment: - sudo python deploy.py -iso ~/ISO/opnfv.iso -dea ~/CONF/virtual/dea.yaml -dha ~/CONF/virtual/dha.yaml -s /mnt/images -p ~/PLUGIN + sudo python deploy.py -iso ~/ISO/opnfv.iso -dea ~/CONF/virtual/dea.yaml -dha ~/CONF/virtual/dha.yaml -s /mnt/images - Deploy OPNFV Cloud on an already active Environment where Fuel Master VM is running so no need to install Fuel again: @@ -120,13 +120,13 @@ optional arguments: sudo python deploy.py -nf -dea ~/CONF/virtual/dea.yaml -dha ~/CONF/virtual/dha.yaml => with plugin installation - sudo python deploy.py -nf -dea ~/CONF/virtual/dea.yaml -dha ~/CONF/virtual/dha.yaml -p ~/PLUGIN + sudo python deploy.py -nf -dea ~/CONF/virtual/dea.yaml -dha ~/CONF/virtual/dha.yaml => with cleanup after deployment is finished - sudo python deploy.py -nf -dea ~/CONF/virtual/dea.yaml -dha ~/CONF/virtual/dha.yaml -p ~/PLUGIN -c + sudo python deploy.py -nf -dea ~/CONF/virtual/dea.yaml -dha ~/CONF/virtual/dha.yaml -c => no healthcheck after deployment is completed - sudo python deploy.py -nf -dea ~/CONF/virtual/dea.yaml -dha ~/CONF/virtual/dha.yaml -p ~/PLUGIN -nh + sudo python deploy.py -nf -dea ~/CONF/virtual/dea.yaml -dha ~/CONF/virtual/dha.yaml -nh - Install Fuel Master only (and Node VMs when using virtual environment): @@ -163,7 +163,7 @@ as default, if DHA file does not exist, the application will terminate with an e => Optional argument -b PXE_BRIDGE is not required for Autodeployment in virtual environment, even if it is specified it will not be used at all because virtual environment is using a different virtual network setup -=> If optional argument -p FUEL_PLUGINS_DIR is not specified, no plugins will be installed in Fuel +=> If optional argument -p FUEL_PLUGINS_DIR is not specified, no external plugins will be installed in Fuel --- Networking considerations --- diff --git a/fuel/deploy/deploy.py b/fuel/deploy/deploy.py index 75cc6cb..178ae76 100644 --- a/fuel/deploy/deploy.py +++ b/fuel/deploy/deploy.py @@ -219,7 +219,7 @@ def check_fuel_plugins_dir(dir): elif not os.listdir(dir): msg = 'Fuel Plugins Directory is empty!' if msg: - warn('%s Opendaylight Fuel Plugin will not be installed!' % msg) + warn('%s No external plugins will be installed!' % msg) def parse_arguments(): diff --git a/fuel/deploy/install_fuel_master.py b/fuel/deploy/install_fuel_master.py index acacf37..0e3c1c0 100644 --- a/fuel/deploy/install_fuel_master.py +++ b/fuel/deploy/install_fuel_master.py @@ -24,6 +24,7 @@ TRANSPLANT_FUEL_SETTINGS = 'transplant_fuel_settings.py' BOOTSTRAP_ADMIN = '/usr/local/sbin/bootstrap_admin_node' FUEL_CLIENT_CONFIG = '/etc/fuel/client/config.yaml' PLUGINS_DIR = '~/plugins' +LOCAL_PLUGIN_FOLDER = '/opt/opnfv' class InstallFuelMaster(object): @@ -91,7 +92,7 @@ class InstallFuelMaster(object): self.delete_deprecated_fuel_client_config_from_fuel_6_1() - self.upload_plugin_files() + self.collect_plugin_files() self.install_plugins() @@ -99,12 +100,15 @@ class InstallFuelMaster(object): log('Fuel Master installed successfully !') - def upload_plugin_files(self): + def collect_plugin_files(self): with self.ssh as s: s.exec_cmd('mkdir %s' % PLUGINS_DIR) if self.fuel_plugins_dir: for f in glob.glob('%s/*.rpm' % self.fuel_plugins_dir): s.scp_put(f, PLUGINS_DIR) + else: + s.exec_cmd('cp %s/*.rpm %s' % (LOCAL_PLUGIN_FOLDER, + PLUGINS_DIR)) def install_plugins(self): log('Installing Fuel Plugins') diff --git a/fuel/deploy/templates/hardware_environment/conf/linux_foundation_lab/pod2/dea.yaml b/fuel/deploy/templates/hardware_environment/conf/linux_foundation_lab/pod2/dea.yaml index 700bff3..81cbcbf 100644 --- a/fuel/deploy/templates/hardware_environment/conf/linux_foundation_lab/pod2/dea.yaml +++ b/fuel/deploy/templates/hardware_environment/conf/linux_foundation_lab/pod2/dea.yaml @@ -112,8 +112,8 @@ transformations_2: bridge: br-mesh name: eth0.302 network: - management_vip: 192.168.0.2 - management_vrouter_vip: 192.168.0.3 + management_vip: 192.168.1.2 + management_vrouter_vip: 192.168.1.3 networking_parameters: base_mac: fa:16:3e:00:00:00 dns_nameservers: @@ -175,11 +175,11 @@ network: vlan_start: 103 name: private vlan_start: 302 - - cidr: 192.168.0.0/24 + - cidr: 192.168.1.0/24 gateway: null ip_ranges: - - - 192.168.0.2 - - 192.168.0.254 + - - 192.168.1.2 + - 192.168.1.254 meta: cidr: 192.168.0.0/24 configurable: true @@ -195,11 +195,11 @@ network: vlan_start: 101 name: management vlan_start: 300 - - cidr: 192.168.1.0/24 + - cidr: 192.168.0.0/24 gateway: null ip_ranges: - - - 192.168.1.2 - - 192.168.1.254 + - - 192.168.0.2 + - 192.168.0.254 meta: cidr: 192.168.1.0/24 configurable: true |